Changeset 83268

Timestamp:

08/29/11 05:11:24 (4 years ago)

Author:

jmr@…

Message:

merge r83267 from trunk:

unset TMP/TMPDIR in env if it's not writable or doesn't look like it will be writable by macportsuser (#30749)

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/macports1.0/macports.tcl (modified) (5 diffs)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/macports1.0/macports.tcl

@@ -827 +827 @@
     }
 
+    # make tools we run operate in UTF-8 mode
+    set env(LANG) en_US.UTF-8
+
     # ENV cleanup.
     set keepenvkeys {
@@ -833 +836 @@
         DYLD_LIBRARY_PATH DYLD_INSERT_LIBRARIES
         HOME JAVA_HOME MASTER_SITE_LOCAL ARCHIVE_SITE_LOCAL
-        PATCH_SITE_LOCAL PATH PORTSRC RSYNC_PROXY TMP TMPDIR
-        USER GROUP
+        PATCH_SITE_LOCAL PATH PORTSRC RSYNC_PROXY
+        USER GROUP LANG
         http_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY NO_PROXY
         COLUMNS LINES
@@ -840 +843 @@
     if {[info exists extra_env]} {
         set keepenvkeys [concat ${keepenvkeys} ${extra_env}]
-    }
-
-    set env_names [array names env]
-    foreach envkey $env_names {
-        if {[lsearch -exact $keepenvkeys $envkey] == -1} {
-            unset env($envkey)
-        }
-    }
-
-    # make tools we run operate in UTF-8 mode
-    set env(LANG) en_US.UTF-8
-
-    if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} {
-        # We'll resolve these later (if needed)
-        trace add variable macports::xcodeversion read macports::setxcodeinfo
-        trace add variable macports::xcodebuildcmd read macports::setxcodeinfo
-    }
-
-    # Set the default umask
-    if {![info exists destroot_umask]} {
-        set destroot_umask 022
-    }
-
-    if {[info exists master_site_local] && ![info exists env(MASTER_SITE_LOCAL)]} {
-        set env(MASTER_SITE_LOCAL) "$master_site_local"
-    }
-    if {[info exists patch_site_local] && ![info exists env(PATCH_SITE_LOCAL)]} {
-        set env(PATCH_SITE_LOCAL) "$patch_site_local"
-    }
-    if {[info exists archive_site_local] && ![info exists env(ARCHIVE_SITE_LOCAL)]} {
-        set env(ARCHIVE_SITE_LOCAL) "$archive_site_local"
     }
 
@@ -887 +859 @@
     }
 
+    # don't keep unusable TMPDIR/TMP values
+    foreach var {TMP TMPDIR} {
+        if {[info exists env($var)] && [file writable $env($var)] && 
+            ([getuid] != 0 || $macportsuser == "root" ||
+             [file attributes $env($var) -owner] == $macportsuser)} {
+            lappend keepenvkeys $var
+        }
+    }
+
+    set env_names [array names env]
+    foreach envkey $env_names {
+        if {[lsearch -exact $keepenvkeys $envkey] == -1} {
+            unset env($envkey)
+        }
+    }
+
     # unset environment an extra time, to work around bugs in Leopard Tcl
     if {$macosx_version == "10.5"} {
@@ -894 +882 @@
             }
         }
+    }
+
+    if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} {
+        # We'll resolve these later (if needed)
+        trace add variable macports::xcodeversion read macports::setxcodeinfo
+        trace add variable macports::xcodebuildcmd read macports::setxcodeinfo
+    }
+
+    # Set the default umask
+    if {![info exists destroot_umask]} {
+        set destroot_umask 022
+    }
+
+    if {[info exists master_site_local] && ![info exists env(MASTER_SITE_LOCAL)]} {
+        set env(MASTER_SITE_LOCAL) "$master_site_local"
+    }
+    if {[info exists patch_site_local] && ![info exists env(PATCH_SITE_LOCAL)]} {
+        set env(PATCH_SITE_LOCAL) "$patch_site_local"
+    }
+    if {[info exists archive_site_local] && ![info exists env(ARCHIVE_SITE_LOCAL)]} {
+        set env(ARCHIVE_SITE_LOCAL) "$archive_site_local"
     }