svn commit: r263180 - head/usr.sbin/pkg

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar 14 17:20:45 2014
New Revision: 263180
URL: http://svnweb.freebsd.org/changeset/base/263180

Log:
  Fix ABI from /usr/local/etc/pkg.conf not being respected.
  
  Regression from r259266.
  
  Sponsored by: EMC / Isilon Storage Division
  MFC after:    1 week

Modified:
  head/usr.sbin/pkg/config.c

Modified: head/usr.sbin/pkg/config.c
==============================================================================
--- head/usr.sbin/pkg/config.c  Fri Mar 14 17:20:23 2014        (r263179)
+++ head/usr.sbin/pkg/config.c  Fri Mar 14 17:20:45 2014        (r263180)
@@ -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
        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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"