Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5cd7fa9
Stop again wasting space for packages in file:// repos
Baptiste Daroussin committed 11 years ago
commit 5cd7fa940d932101277ae0797afd8754053520ce
parent 8f67c17
1 file changed +10 -5
modified libpkg/repo/binary/fetch.c
@@ -56,10 +56,19 @@ pkg_repo_binary_get_cached_name(struct pkg_repo *repo, struct pkg *pkg,
{

	const char *ext = NULL;

	const char *cachedir = NULL;
+ 
	const char *packagesite;

	struct stat st;



	cachedir = pkg_object_string(pkg_config_get("PKG_CACHEDIR"));
+ 
	packagesite = pkg_repo_url(repo);
+
+ 
	if (strncmp(packagesite, "file://", 7) == 0) {
+ 
		snprintf(dest, destlen, "%s/%s", packagesite + 7,
+ 
		    pkg->repopath);
+ 
		return (EPKG_OK);
+ 
	}
+ 


	if (pkg->repopath != NULL)

		ext = strrchr(pkg->repopath, '.');
@@ -186,12 +195,8 @@ 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);
+ 
	if (!mirror && strncasecmp(packagesite, "file://", 7) == 0)

		return (EPKG_OK);
- 
	}*/



	retcode = pkg_fetch_file(repo, url, dest, 0);

	fetched = 1;