dc379a9 Allow url to be overridden by other repo configs — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Allow url to be overridden by other repo configs

Bryan Drewery committed 11 years ago

commit dc379a953fce855044fc7bfff9eb6b6a999fc969
parent f1772d8

1 file changed +18 -0

modified libpkg/pkg_config.c

@@ -323,6 +323,8 @@ static size_t c_size = NELEM(c);

 static struct pkg_repo* pkg_repo_new(const char *name,
 	const char *url, const char *type);
 static void pkg_repo_overwrite(struct pkg_repo*, const char *name,
 	const char *url, const char *type);
 static void pkg_repo_free(struct pkg_repo *r);
 static void

@@ -503,6 +505,8 @@ add_repo(const ucl_object_t *obj, struct pkg_repo *r, const char *rname)

 	if (r == NULL)
 		r = pkg_repo_new(rname, url, type);
 	else
 		pkg_repo_overwrite(r, rname, url, type);
 	if (signature_type != NULL) {
 		if (strcasecmp(signature_type, "pubkey") == 0)

@@ -983,6 +987,20 @@ pkg_repo_new(const char *name, const char *url, const char *type)

 }
 static void
 pkg_repo_overwrite(struct pkg_repo *r, const char *name, const char *url,
     const char *type)
 {
 	free(r->name);
 	free(r->url);
 	r->name = strdup(name);
 	r->url = strdup(url);
 	r->ops = pkg_repo_find_type(type);
 	HASH_DEL(repos, r);
 	HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r);
 }
 static void
 pkg_repo_free(struct pkg_repo *r)
 {
 	free(r->url);