[24876] branches/dp2mp-move/base/src/macports1.0

[source_changes at macosforge.org]

Revision: 24876
          http://trac.macosforge.org/projects/macports/changeset/24876
Author:   jmpp at macports.org
Date:     2007-05-06 22:47:08 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Merging jberry's r24831: Setup for autoconf of macports_user_dir. create a ~/.macports directory if it doesn't exist (NOTE: overriding default path still neeeds autoconfiscation hooks here and in trunk).

Modified Paths:
--------------
    branches/dp2mp-move/base/src/macports1.0/macports.tcl
    branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in

Modified: branches/dp2mp-move/base/src/macports1.0/macports.tcl
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-07 04:37:41 UTC (rev 24875)
+++ branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-07 05:47:08 UTC (rev 24876)
@@ -243,6 +243,7 @@
 	
 	global auto_path env
 	global macports::autoconf::mports_conf_path
+        global macports::autoconf::macports_user_dir
 	global macports::bootstrap_options
 	global macports::user_options
 	global macports::extra_env
@@ -264,6 +265,9 @@
    	global macports::variants_conf
    	global macports::xcodebuildcmd
    	global macports::xcodeversion
+
+        # Ensure that the macports user directory exists
+        file mkdir $macports_user_dir
    	
    	# Configure the search path for configuration files
    	set conf_files ""
@@ -271,7 +275,7 @@
 		set PORTSRC [lindex [array get env PORTSRC] 1]
 		lappend conf_files ${PORTSRC}
     }
-    lappend conf_files "~/.macports/macports.conf" "${mports_conf_path}/macports.conf"
+    lappend conf_files "${macports_user_dir}/macports.conf" "${mports_conf_path}/macports.conf"
     
     # Process the first configuration file we find on conf_files list
 	foreach file $conf_files {
@@ -292,7 +296,7 @@
 	}
 	
 	# Process per-user only settings
-	set per_user "~/.macports/user.conf"
+        set per_user "${macports_user_dir}/user.conf"
 	if [file exists $per_user] {
 		set fd [open $per_user r]
 		while {[gets $fd line] >= 0} {
@@ -306,7 +310,7 @@
 	}
 	
     if {![info exists sources_conf]} {
-        return -code error "sources_conf must be set in $mports_conf_path/macports.conf or in your ~/.macports/macports.conf file"
+        return -code error "sources_conf must be set in $mports_conf_path/macports.conf or in your ${macports_user_dir}/macports.conf file"
     }
     if {[catch {set fd [open $sources_conf r]} result]} {
         return -code error "$result"

Modified: branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in	2007-05-07 04:37:41 UTC (rev 24875)
+++ branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in	2007-05-07 05:47:08 UTC (rev 24876)
@@ -32,6 +32,7 @@
 
 namespace eval macports::autoconf {
 	variable mports_conf_path "@MPCONFIGDIR_EXPANDED@"
+        variable macports_user_dir "~/.macports"
         variable svn_path "@SVN@"
 	variable rsync_path "@RSYNC@"
         variable open_path "@OPEN@"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070506/96e83c7f/attachment.html