d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ABI from /usr/local/etc/pkg.conf not being respected.

Browse Source 
Regression from r259266.

Sponsored by:	EMC / Isilon Storage Division
MFC after:	1 week
This commit is contained in:
Bryan Drewery 2014-03-14 17:20:45 +00:00
parent 552968bfb9
commit 97c3a76638
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=263180
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/pkg/config.c
View File

@ -66,6 +66,7 @@ struct config_entry {
char *value;
STAILQ_HEAD(, config_value) *list;
bool envset;
bool main_only; /* Only set in pkg.conf. */
};
static struct config_entry c[] = {
@ -76,6 +77,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
false,
},
[ABI] = {
PKG_CONFIG_STRING,
@ -84,6 +86,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
true,
},
[MIRROR_TYPE] = {
PKG_CONFIG_STRING,
@ -92,6 +95,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
false,
},
[ASSUME_ALWAYS_YES] = {
PKG_CONFIG_BOOL,
@ -100,6 +104,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
true,
},
[SIGNATURE_TYPE] = {
PKG_CONFIG_STRING,
@ -108,6 +113,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
false,
},
[FINGERPRINTS] = {
PKG_CONFIG_STRING,
@ -116,6 +122,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
false,
},
[REPOS_DIR] = {
PKG_CONFIG_LIST,
@ -124,6 +131,7 @@ static struct config_entry c[] = {
NULL,
NULL,
false,
true,
},
};
@ -597,6 +605,9 @@ config_parse(ucl_object_t *obj, pkg_conf_file_t conftype)
for (i = 0; i < CONFIG_SIZE; i++) {
if (c[i].envset)
continue;
/* Prevent overriding ABI, ASSUME_ALWAYS_YES, etc. */
if (conftype != CONFFILE_PKG && c[i].main_only == true)
continue;
switch (c[i].type) {
case PKG_CONFIG_LIST:
c[i].list = temp_config[i].list;