Ticket #16329: mp-config-handling2.patch

File mp-config-handling2.patch, 1.7 KB (added by adambyrtek@…, 16 years ago)

Spaces instead of tabs in ChangeLog

  • src/macports1.0/macports.tcl

     
    369369   
    370370    # Configure the search path for configuration files
    371371    set conf_files ""
     372    lappend conf_files "${macports_conf_path}/macports.conf"
     373    if { [file isdirectory $macports_user_dir] } {
     374        lappend conf_files "${macports_user_dir}/macports.conf"
     375    }
    372376    if {[info exists env(PORTSRC)]} {
    373377        set PORTSRC $env(PORTSRC)
    374378        lappend conf_files ${PORTSRC}
    375379    }
    376     if { [file isdirectory $macports_user_dir] } {
    377         lappend conf_files "${macports_user_dir}/macports.conf"
    378     }
    379     lappend conf_files "${macports_conf_path}/macports.conf"
    380380   
    381381    # Process the first configuration file we find on conf_files list
    382382    foreach file $conf_files {
    … …  
    391391                    }
    392392                }
    393393            }           
    394             break
    395394        }
    396395    }
    397396   

  • ChangeLog

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