[138100] trunk/base/src

[jmr at macports.org]

Revision: 138100
          https://trac.macports.org/changeset/138100
Author:   jmr at macports.org
Date:     2015-06-28 00:49:51 -0700 (Sun, 28 Jun 2015)
Log Message:
-----------
Remove workarounds for Leopard Tcl env bug. Confirmed that our Tcl 8.5 does not suffer from it on Leopard.

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port/port.tcl
    trunk/base/src/port1.0/porttrace.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/macports1.0/macports.tcl	2015-06-28 07:49:51 UTC (rev 138100)
@@ -1085,15 +1085,6 @@
         }
     }
 
-    # unset environment an extra time, to work around bugs in Leopard Tcl
-    if {$macosx_version eq "10.5"} {
-        foreach envkey $env_names {
-            if {$envkey ni $keepenvkeys} {
-                unsetenv $envkey
-            }
-        }
-    }
-
     if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} {
         # We'll resolve these later (if needed)
         trace add variable macports::xcodeversion read macports::setxcodeinfo

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/port/port.tcl	2015-06-28 07:49:51 UTC (rev 138100)
@@ -1870,9 +1870,6 @@
         global env boot_env
         array unset env_save; array set env_save [array get env]
         array unset env *
-        if {${macports::macosx_version} == "10.5"} {
-            unsetenv *
-        }
         array set env [array get boot_env]
 
         if [catch {system -nodup [list ${macports::autoconf::man_path} $pagepath]} result] {
@@ -1883,9 +1880,6 @@
 
         # Restore internal MacPorts environment
         array unset env *
-        if {${macports::macosx_version} == "10.5"} {
-            unsetenv *
-        }
         array set env [array get env_save]
     } else {
         ui_error "Sorry, no help for this topic is available."
@@ -3927,9 +3921,6 @@
                     # may want stuff from it as well, like TERM.
                     array unset env_save; array set env_save [array get env]
                     array unset env *
-                    if {${macports::macosx_version} eq "10.5"} {
-                        unsetenv *
-                    }
                     array set env [array get boot_env]
                     
                     # Find an editor to edit the portfile
@@ -3958,9 +3949,6 @@
                     
                     # Restore internal MacPorts environment
                     array unset env *
-                    if {${macports::macosx_version} eq "10.5"} {
-                        unsetenv *
-                    }
                     array set env [array get env_save]
                 }
 

Modified: trunk/base/src/port1.0/porttrace.tcl
===================================================================
--- trunk/base/src/port1.0/porttrace.tcl	2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/port1.0/porttrace.tcl	2015-06-28 07:49:51 UTC (rev 138100)
@@ -263,9 +263,6 @@
 
 		foreach var {DYLD_INSERT_LIBRARIES DARWINTRACE_LOG} {
 			array unset env $var
-			if {$macosx_version eq "10.5"} {
-				unsetenv $var
-			}
 		}
 
 		# Kill socket

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/port1.0/portutil.tcl	2015-06-28 07:49:51 UTC (rev 138100)
@@ -461,9 +461,6 @@
 
     # Restore the environment.
     array unset env *
-    if {$macosx_version eq "10.5"} {
-        unsetenv *
-    }
     array set env [array get saved_env]
 
     # Return as if system had been called directly.
@@ -1020,9 +1017,6 @@
                     set env(LC_CTYPE) $oldlocale
                 } else {
                     unset env(LC_CTYPE)
-                    if {$macosx_version eq "10.5"} {
-                        unsetenv LC_CTYPE
-                    }
                 }
             }
             close $tmpfd
@@ -1034,9 +1028,6 @@
                 set env(LC_CTYPE) $oldlocale
             } else {
                 unset env(LC_CTYPE)
-                if {$macosx_version eq "10.5"} {
-                    unsetenv LC_CTYPE
-                }
             }
         }
         close $tmpfd
@@ -1607,9 +1598,6 @@
     set env(HOME) $savedhome
     if {[info exists env(TMPDIR)]} {
         unset env(TMPDIR)
-        if {$macosx_version eq "10.5"} {
-            unsetenv TMPDIR
-        }
     }
 
     return $result
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150628/48ad5617/attachment.html>