c7fec64 Use pkg_manifest instead of pkg. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use pkg_manifest instead of pkg.

jlaffaye committed 15 years ago

commit c7fec64ca4f793d31c18695d735e2bf431a32084
parent 4fde78b

1 file changed +5 -4

modified libpkg/pkg_create.c

@@ -134,7 +134,8 @@ pkg_create(const char *mpath, pkg_formats format, const char *outdir, const char

 		err(1, "mpath or pkg required");
 	}
 	snprintf(namever, sizeof(namever), "%s-%s", pkg_name(pkg), pkg_version(pkg));
 	snprintf(namever, sizeof(namever), "%s-%s", pkg_manifest_value(m, "name"),
 			 pkg_manifest_value(m, "version"));
 	printf("Creating package %s/%s.%s\n", outdir, namever, ext);
 	snprintf(archive_path, sizeof(archive_path), "%s/%s.%s", outdir, namever, ext);

@@ -160,21 +161,21 @@ pkg_create_set_format(struct archive *pkg_archive, pkg_formats format)

 			return ("tar");
 		case TGZ:
 			if (archive_write_set_compression_gzip(pkg_archive) != ARCHIVE_OK) {
 				warnx("gzip compression is not supported trying plain tar");
 				warnx("gzip compression is not supported, trying plain tar");
 				return (pkg_create_set_format(pkg_archive, TAR));
 			} else {
 				return ("tgz");
 			}
 		case TBZ:
 			if (archive_write_set_compression_bzip2(pkg_archive) != ARCHIVE_OK) {
 				warnx("bzip2 compression is not supported trying gzip");
 				warnx("bzip2 compression is not supported, trying gzip");
 				return (pkg_create_set_format(pkg_archive, TGZ));
 			} else {
 				return ("tbz");
 			}
 		case TXZ:
 			if (archive_write_set_compression_xz(pkg_archive) != ARCHIVE_OK) {
 				warnx("xs compression is not supported trying bzip2");
 				warnx("xz compression is not supported, trying bzip2");
 				return (pkg_create_set_format(pkg_archive, TBZ));
 			} else {
 				return ("txz");