bb8cc38 Only work with new abi by default — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Only work with new abi by default

Baptiste Daroussin committed 11 years ago

commit bb8cc38fcee0d3748bd9ee07a88b546b55a919fb
parent 1159543

2 files changed +5 -5

modified libpkg/pkg_create.c

@@ -246,10 +246,10 @@ pkg_create_from_manifest(const char *outdir, pkg_formats format,

 	}
 	/* if no arch autodetermine it */
 	pkg_get(pkg, PKG_ARCH, &buf);
 	pkg_get(pkg, PKG_ABI, &buf);
 	if (buf == NULL) {
 		pkg_get_myarch(arch, BUFSIZ);
 		pkg_set(pkg, PKG_ARCH, arch);
 		pkg_set(pkg, PKG_ABI, arch);
 	}
 	/* Create the archive */

@@ -335,7 +335,7 @@ pkg_create_staged(const char *outdir, pkg_formats format, const char *rootdir,

 	pkg_get(pkg, PKG_ARCH, &buf);
 	if (buf == NULL) {
 		pkg_get_myarch(arch, BUFSIZ);
 		pkg_set(pkg, PKG_ARCH, arch);
 		pkg_set(pkg, PKG_ABI, arch);
 	}
 	for (i = 0; scripts[i] != NULL; i++) {

modified src/register.c

@@ -312,7 +312,7 @@ exec_register(int argc, char **argv)

 	if (!testing_mode)
 		pkg_analyse_files(db, pkg, input_path);
 	pkg_get(pkg, PKG_ARCH, &arch);
 	pkg_get(pkg, PKG_ABI, &arch);
 	if (arch == NULL) {
 		/*
 		 * do not take the one from configuration on purpose

@@ -321,7 +321,7 @@ exec_register(int argc, char **argv)

 		pkg_get_myarch(myarch, BUFSIZ);
 		if (developer)
 			pkg_suggest_arch(pkg, myarch, true);
 		pkg_set(pkg, PKG_ARCH, myarch);
 		pkg_set(pkg, PKG_ABI, myarch);
 	} else {
 		if (developer)
 			pkg_suggest_arch(pkg, arch, false);