[24831] trunk/base/src/darwinports1.0

[source_changes at macosforge.org]

Revision: 24831
          http://trac.macosforge.org/projects/macports/changeset/24831
Author:   jberry at macports.org
Date:     2007-05-05 17:35:02 -0700 (Sat, 05 May 2007)

Log Message:
-----------
Setup for autoconf of macports_user_dir. create a ~/.macports directory if it doesn't exist

Modified Paths:
--------------
    trunk/base/src/darwinports1.0/darwinports.tcl
    trunk/base/src/darwinports1.0/darwinports_autoconf.tcl.in

Modified: trunk/base/src/darwinports1.0/darwinports.tcl
===================================================================
--- trunk/base/src/darwinports1.0/darwinports.tcl	2007-05-06 00:18:39 UTC (rev 24830)
+++ trunk/base/src/darwinports1.0/darwinports.tcl	2007-05-06 00:35:02 UTC (rev 24831)
@@ -243,6 +243,7 @@
 	
 	global auto_path env
 	global darwinports::autoconf::dports_conf_path
+	global darwinports::autoconf::macports_user_dir
 	global darwinports::bootstrap_options
 	global darwinports::user_options
 	global darwinports::extra_env
@@ -265,13 +266,16 @@
    	global darwinports::xcodebuildcmd
    	global darwinports::xcodeversion
    	
+    # Ensure that the macports user directory exists
+    file mkdir $macports_user_dir
+    
    	# Configure the search path for configuration files
    	set conf_files ""
     if {[llength [array names env PORTSRC]] > 0} {
 		set PORTSRC [lindex [array get env PORTSRC] 1]
 		lappend conf_files ${PORTSRC}
     }
-    lappend conf_files "~/.macports/ports.conf" "${dports_conf_path}/ports.conf"
+    lappend conf_files "${macports_user_dir}/ports.conf" "${dports_conf_path}/ports.conf"
     
     # Process the first configuration file we find on conf_files list
 	foreach file $conf_files {
@@ -296,7 +300,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} {
@@ -310,7 +314,7 @@
 	}
 	
     if {![info exists sources_conf]} {
-        return -code error "sources_conf must be set in $dports_conf_path/ports.conf or in your ~/.portsrc"
+        return -code error "sources_conf must be set in $dports_conf_path/ports.conf or in $macports_user_dir/ports.conf"
     }
     if {[catch {set fd [open $sources_conf r]} result]} {
         return -code error "$result"

Modified: trunk/base/src/darwinports1.0/darwinports_autoconf.tcl.in
===================================================================
--- trunk/base/src/darwinports1.0/darwinports_autoconf.tcl.in	2007-05-06 00:18:39 UTC (rev 24830)
+++ trunk/base/src/darwinports1.0/darwinports_autoconf.tcl.in	2007-05-06 00:35:02 UTC (rev 24831)
@@ -32,6 +32,7 @@
 
 namespace eval darwinports::autoconf {
 	variable dports_conf_path "@PORTCONFIGDIR_EXPANDED@"
+	variable macports_user_dir "~/.macports"
 	variable rsync_path "@RSYNC@"
 	variable open_path "@OPEN@"
 }

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