[25444] branches/dp2mp-move/base/src

[source_changes at macosforge.org]

Revision: 25444
          http://trac.macosforge.org/projects/macports/changeset/25444
Author:   jmpp at macports.org
Date:     2007-05-21 23:09:08 -0700 (Mon, 21 May 2007)

Log Message:
-----------
Merging jberry's r25177: Only try to evaluate macports_user_dir if the HOME environment variable exists (...).

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

Modified: branches/dp2mp-move/base/src/macports1.0/macports.tcl
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-22 05:55:40 UTC (rev 25443)
+++ branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-22 06:09:08 UTC (rev 25444)
@@ -280,23 +280,31 @@
    	global macports::xcodebuildcmd
    	global macports::xcodeversion
 
-        # Ensure that the macports user directory exists
-        set macports::macports_user_dir [file normalize $macports::autoconf::macports_user_dir]
-        if { ![file exists $macports_user_dir] } {
-	    # If not, create it with ownership of the enclosing directory, rwx by the user only
-	    file mkdir $macports_user_dir
-	    file attributes $macports_user_dir -permissions u=rwx,go= \
-		-owner [file attributes $macports_user_dir/.. -owner] \
-		-group [file attributes $macports_user_dir/.. -group]
+        # Ensure that the macports user directory exists if HOME is defined
+        if {[info exists env(HOME)]} {
+	    set macports::macports_user_dir [file normalize $macports::autoconf::macports_user_dir]
+	    if { ![file exists $macports_user_dir] } {
+		# If not, create it with ownership of the enclosing directory, rwx by the user only
+		file mkdir $macports_user_dir
+		file attributes $macports_user_dir -permissions u=rwx,go= \
+		    -owner [file attributes $macports_user_dir/.. -owner] \
+		    -group [file attributes $macports_user_dir/.. -group]
+	    }
+	} else {
+	    # Otherwise define the user directory as a direcotory that will never exist
+	    set macports::macports_user_dir "/dev/null/NO_HOME_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}
+        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_user_dir}/macports.conf" "${macports_conf_path}/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 {

Modified: branches/dp2mp-move/base/src/port/port.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/port.tcl	2007-05-22 05:55:40 UTC (rev 25443)
+++ branches/dp2mp-move/base/src/port/port.tcl	2007-05-22 06:09:08 UTC (rev 25444)
@@ -2452,7 +2452,7 @@
 	set history_file [file normalize "${macports::macports_user_dir}/history"]
 
 	# Read readline history
-	if {$use_readline} {
+	if {$use_readline && [file isdirectory $macports::macports_user_dir]} {
 		rl_history read $history_file
 		rl_history stifle 100
 	}
@@ -2495,7 +2495,7 @@
 	}
 	
 	# Save readine history
-	if {$use_readline} {
+	if {$use_readline && [file isdirectory $macports::macports_user_dir]} {
 		rl_history write $history_file
 	}
 	

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