a4d827d Be able to set the PKG_REPOURL — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Be able to set the PKG_REPOURL

Marin Atanasov Nikolov committed 14 years ago

commit a4d827d675b5f0aa787dfabcb8034c34f1e8146c
parent 41c7ef3

2 files changed +2 -5

modified libpkg/pkg.c

@@ -208,8 +208,6 @@ static int

 pkg_vset(struct pkg *pkg, va_list ap)
 {
 	struct pkg_config_kv *repokv = NULL;
 	char *reponame = NULL;
 	char *repourl = NULL;
 	bool multirepos_enabled = false;
 	int attr;

@@ -233,9 +231,8 @@ pkg_vset(struct pkg *pkg, va_list ap)

 			}
 			if (attr == PKG_REPONAME && multirepos_enabled) {
 				pkg_get(pkg, PKG_REPONAME, &reponame, PKG_REPOURL, &repourl);
 				while (pkg_config_list(PKG_CONFIG_REPOS, &repokv) == EPKG_OK) {
 					if (strcmp(reponame, pkg_config_kv_get(repokv, PKG_CONFIG_KV_KEY)) == 0)
 					if (strcmp(str, pkg_config_kv_get(repokv, PKG_CONFIG_KV_KEY)) == 0)
 						pkg_set(pkg, PKG_REPOURL, pkg_config_kv_get(repokv, PKG_CONFIG_KV_VALUE));
 				}
 			}

modified libpkg/pkg_private.h

@@ -13,7 +13,7 @@

 #include "pkg_util.h"
 #define PKG_NUM_FIELDS 17
 #define PKG_NUM_FIELDS 18
 #define EXTRACT_ARCHIVE_FLAGS  (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \
 		ARCHIVE_EXTRACT_TIME  |ARCHIVE_EXTRACT_ACL | \