Ticket #16329: mp-config-handling.patch

src/macports1.0/macports.tcl

@@ -369 +369 @@
     
     # Configure the search path for configuration files
     set conf_files ""
+    lappend conf_files "${macports_conf_path}/macports.conf"
+    if { [file isdirectory $macports_user_dir] } {
+        lappend conf_files "${macports_user_dir}/macports.conf"
+    }
     if {[info exists env(PORTSRC)]} {
         set PORTSRC $env(PORTSRC)
         lappend conf_files ${PORTSRC}
     }
-    if { [file isdirectory $macports_user_dir] } {
-        lappend conf_files "${macports_user_dir}/macports.conf"
-    }
-    lappend conf_files "${macports_conf_path}/macports.conf"
     
     # Process the first configuration file we find on conf_files list
     foreach file $conf_files {
@@ -391 +391 @@
                     }
                 }
             }            
-            break
         }
     }
     

ChangeLog

@@ -5 +5 @@
 
 
 Unreleased:
+        - Changes in loading of configuration files. Currently the global
+          configuration file is loaded first, then user defined one (if present),
+          PORTSRC environment variable is loaded last. Last defined value is used
+          for each configuration option. (#16329, contributed by Adam Byrtek)
+
     - Ruby port group now accepts a new (optional) last parameter for the
       ruby.setup command, "implementation". It is "ruby" by default, and 
       can be set to "ruby19". It names the ruby-implementing port, and can