cb0e19c Inside a package 'arch' is always defined, but 'abi' may not been defined — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Inside a package 'arch' is always defined, but 'abi' may not been defined

Baptiste Daroussin committed 11 years ago

commit cb0e19c9888f8372a24dfcdd6c5364bf1216c752
parent 818dd24

1 file changed +0 -6

modified libpkg/pkg.c

@@ -1479,8 +1479,6 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae,

 		if (!manifest && strcmp(fpath, "+MANIFEST") == 0) {
 			manifest = true;
 			char *buffer;
 			char legacyarch[BUFSIZ];
 			const char *abi;
 			size_t len = archive_entry_size(*ae);
 			buffer = malloc(len);

@@ -1496,10 +1494,6 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae,

 				goto cleanup;
 			}
 			pkg_get(pkg, PKG_ABI, &abi);
 			pkg_arch_to_legacy(abi, legacyarch, BUFSIZ);
 			pkg_set(pkg, PKG_ARCH, legacyarch);
 			if (flags & PKG_OPEN_MANIFEST_ONLY)
 				break;
 		}