a361df4 Name files in cache by their checksum — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Name files in cache by their checksum

Baptiste Daroussin committed 12 years ago

commit a361df4996f45ee3dca827c0e1b8312e7141589d
parent b6edb6a

3 files changed +6 -10

modified libpkg/pkg_add.c

@@ -239,7 +239,7 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags, struct pkg_manifest_

 	 * somesuch, there's no valid directory to search.
 	 */
 	if (strncmp(path, "-", 2) != 0) {
 	if (strncmp(path, "-", 2) != 0 && (flags & PKG_ADD_UPGRADE) == 0) {
 		basedir = dirname(path);
 		if ((ext = strrchr(path, '.')) == NULL) {
 			pkg_emit_error("%s has no extension", path);

modified libpkg/pkg_jobs.c

@@ -1799,7 +1799,7 @@ pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j, bool handle_r

 		target = ps->items[0]->jp->path;
 	}
 	else {
 		pkg_snprintf(path, sizeof(path), "%S/%R", cachedir, new);
 		pkg_snprintf(path, sizeof(path), "%S/%u", cachedir, new);
 		target = path;
 	}

@@ -2031,8 +2031,8 @@ pkg_jobs_apply(struct pkg_jobs *j)

 			if (p->type != PKG_REMOTE)												\
 				continue;															\
 			int64_t pkgsize;														\
 			pkg_get(p, PKG_PKGSIZE, &pkgsize, PKG_REPOPATH, &repopath);				\
 			snprintf(cachedpath, sizeof(cachedpath), "%s/%s", cachedir, repopath);	\
 			pkg_get(p, PKG_PKGSIZE, &pkgsize);				\
 			pkg_snprintf(cachedpath, sizeof(cachedpath), "%S/%u", cachedir, p);	\
 			if (stat(cachedpath, &st) == -1)										\
 				dlsize += pkgsize;													\
 			else																	\

@@ -2062,7 +2062,6 @@ pkg_jobs_fetch(struct pkg_jobs *j)

 	struct stat st;
 	int64_t dlsize = 0;
 	const char *cachedir = NULL;
 	const char *repopath = NULL;
 	char cachedpath[MAXPATHLEN];
 	cachedir = pkg_object_string(pkg_config_get("PKG_CACHEDIR"));

@@ -2128,10 +2127,7 @@ pkg_jobs_check_conflicts(struct pkg_jobs *j)

 		else {
 			p = ps->items[0]->pkg;
 			if (p->type == PKG_REMOTE) {
 				const char *pkgrepopath;
 				pkg_get(p, PKG_REPOPATH, &pkgrepopath);
 				snprintf(path, sizeof(path), "%s/%s", cachedir,
 						pkgrepopath);
 				pkg_snprintf(path, sizeof(path), "%S/%u", cachedir, p);
 				if (pkg_open(&pkg, path, keys, 0) != EPKG_OK)
 					return (EPKG_FATAL);
 				p = pkg;

modified libpkg/pkg_repo.c

@@ -73,7 +73,7 @@ pkg_repo_fetch(struct pkg *pkg)

 	pkg_get(pkg, PKG_REPONAME, &reponame,
 	    PKG_CKSUM, &sum, PKG_NAME, &name, PKG_VERSION, &version);
 	pkg_snprintf(dest, sizeof(dest), "%S/%R", cachedir, pkg);
 	pkg_snprintf(dest, sizeof(dest), "%S/%u", cachedir, pkg);
 	/* If it is already in the local cachedir, dont bother to
 	 * download it */