a3433e1 Bring back fetching in the the cache directory for file:// — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Bring back fetching in the the cache directory for file://

Baptiste Daroussin committed 11 years ago

commit a3433e16761681f54bba7aa838a3a3453be3e8fc
parent c26560e

2 files changed +6 -5

modified libpkg/repo/binary/fetch.c

@@ -186,11 +186,12 @@ pkg_repo_binary_try_fetch(struct pkg_repo *repo, struct pkg *pkg,

 	else
 		pkg_snprintf(url, sizeof(url), "%S/%R", packagesite, pkg);
 	/*
 	if (!mirror && strncasecmp(packagesite, "file://", 7) == 0) {
 		free(pkg->repopath);
 		pkg->repopath = strdup(url + 7);
 		return (EPKG_OK);
 	}
 	}*/
 	retcode = pkg_fetch_file(repo, url, dest, 0);
 	fetched = 1;

modified tests/frontend/packagesplit.shin

@@ -137,10 +137,10 @@ local: {

 }
 EOF
 	atf_check \
 		-o ignore \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR="$tmpdir" upgrade -y
 		-o empty \
 		-e ignore \
 		-s ignore \
 		pkg -o REPOS_DIR="$tmpdir" -o PKG_CACHEDIR="$tmpdir" upgrade -y
 }
 atf_init_test_cases() {