[68688] branches/release_1_9/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 68688
          http://trac.macports.org/changeset/68688
Author:   jmr at macports.org
Date:     2010-06-10 04:51:35 -0700 (Thu, 10 Jun 2010)
Log Message:
-----------
merge r68683 from trunk:
 slightly more efficient env cleanup

Revision Links:
--------------
    http://trac.macports.org/changeset/68683

Modified Paths:
--------------
    branches/release_1_9/base/src/macports1.0/macports.tcl

Modified: branches/release_1_9/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_9/base/src/macports1.0/macports.tcl	2010-06-10 11:48:33 UTC (rev 68687)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl	2010-06-10 11:51:35 UTC (rev 68688)
@@ -834,9 +834,10 @@
         set keepenvkeys [concat ${keepenvkeys} ${extra_env}]
     }
 
-    foreach envkey [array names env] {
-        if {[lsearch $keepenvkeys $envkey] == -1} {
-            array unset env $envkey
+    set env_names [array names env]
+    foreach envkey $env_names {
+        if {[lsearch -exact $keepenvkeys $envkey] == -1} {
+            unset env($envkey)
         }
     }
 
@@ -870,8 +871,8 @@
     }
 
     # unset environment an extra time, to work around bugs in Leopard Tcl
-    foreach envkey [array names env] {
-        if {[lsearch $keepenvkeys $envkey] == -1} {
+    foreach envkey $env_names {
+        if {[lsearch -exact $keepenvkeys $envkey] == -1} {
             unsetenv $envkey
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100610/f9b8d760/attachment.html>