2f78c0c prepend multirepos by repo- this avoid having the need to get reserved names (fixes #394) — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

prepend multirepos by repo- this avoid having the need to get reserved names (fixes #394)

Baptiste Daroussin committed 13 years ago

commit 2f78c0ca15b7bd9ab4f78a69979d3b391d1d7efe
parent b052960

2 files changed +4 -9

modified libpkg/pkgdb.c

@@ -648,13 +648,6 @@ pkgdb_open_multirepos(const char *dbdir, struct pkgdb *db)

 		const char *repo_name = pkg_config_kv_get(repokv,
 		    PKG_CONFIG_KV_KEY);
 		/* is it a reserved name? */
 		if ((strcmp(repo_name, "repo") == 0) ||
 		    (strcmp(repo_name, "main") == 0) ||
 		    (strcmp(repo_name, "temp") == 0) ||
 		    (strcmp(repo_name, "local") == 0))
 			continue;
 		/* is it already attached? */
 		if (is_attached(db->sqlite, repo_name)) {
 			pkg_emit_error("repository '%s' is already "

@@ -662,7 +655,7 @@ pkgdb_open_multirepos(const char *dbdir, struct pkgdb *db)

 			continue;
 		}
 		snprintf(remotepath, sizeof(remotepath), "%s/%s.sqlite",
 		snprintf(remotepath, sizeof(remotepath), "%s/repo-%s.sqlite",
 		    dbdir, repo_name);
 		if (access(remotepath, R_OK) != 0) {

modified pkg/update.c

@@ -50,6 +50,7 @@ pkgcli_update(bool force) {

 	bool multi_repos = false;
 	struct pkg_config_kv *repokv = NULL;
 	int retcode = EPKG_FATAL;
 	char name[MAXPATHLEN];
 	if (!quiet)
 		printf("Updating repository catalogue\n");

@@ -82,7 +83,8 @@ pkgcli_update(bool force) {

 			repo_name = pkg_config_kv_get(repokv, PKG_CONFIG_KV_KEY);
 			packagesite = pkg_config_kv_get(repokv, PKG_CONFIG_KV_VALUE);
 			retcode = pkg_update(repo_name, packagesite, force);
 			snprintf(name, MAXPATHLEN, "repo-%s.sqlite", repo_name);
 			retcode = pkg_update(name, packagesite, force);
 			if (retcode == EPKG_UPTODATE) {
 				if (!quiet)
 					printf("%s repository catalogue is "