[40712] trunk/base

[raimue at macports.org]

Revision: 40712
          http://trac.macports.org/changeset/40712
Author:   raimue at macports.org
Date:     2008-10-11 19:53:54 -0700 (Sat, 11 Oct 2008)
Log Message:
-----------
base:
Inheritance of macports.conf, patch by Adam Byrtek
Closes #16329

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2008-10-11 19:52:31 UTC (rev 40711)
+++ trunk/base/ChangeLog	2008-10-12 02:53:54 UTC (rev 40712)
@@ -5,6 +5,11 @@
 
 
 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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2008-10-11 19:52:31 UTC (rev 40711)
+++ trunk/base/src/macports1.0/macports.tcl	2008-10-12 02:53:54 UTC (rev 40712)
@@ -369,14 +369,14 @@
     
     # 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,7 +391,6 @@
                     }
                 }
             }            
-            break
         }
     }
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081011/0211af05/attachment.html