a45fec0 Fix dynamic conflicts — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix dynamic conflicts

Baptiste Daroussin committed 11 years ago

commit a45fec0f1a68fdfb92e19a5b78c48bff70e1e8ae
parent f77fb55

1 file changed +3 -10

modified libpkg/repo/binary/fetch.c

@@ -74,21 +74,14 @@ pkg_repo_binary_get_cached_name(struct pkg_repo *repo, struct pkg *pkg,

 	if (ext != NULL) {
 		/*
 		 * XXX:
 		 * This code tries to skip refetching but it should be removed as soon
 		 * as we transfer to new scheme.
 		 */
 		pkg_snprintf(dest, destlen, "%S/%n-%v-%z",
 				cachedir, pkg, pkg, pkg);
 		if (stat (dest, &st) != -1 || pkg->pkgsize != st.st_size)
 			return (EPKG_FATAL);
 		/*
 		 * The real naming scheme:
 		 * <cachedir>/<name>-<version>-<checksum>.txz
 		 */
 		pkg_snprintf(dest, destlen, "%S/%n-%v-%z%S",
 				cachedir, pkg, pkg, pkg, ext);
 		if (stat (dest, &st) == -1 || pkg->pkgsize != st.st_size)
 			return (EPKG_FATAL);
 	}
 	else {
 		pkg_snprintf(dest, destlen, "%S/%n-%v-%z",