Changeset 18681 for trunk/base

Timestamp:

Jul 22, 2006, 5:50:41 AM (18 years ago)

Author:

pguyot (Paul Guyot)

Message:

Fix extra_env.
Added a regression test for this bug.

Bug: #9948
Submitted by:
Reviewed by:
Approved by:
Obtained from:

Location:

trunk/base

Files:

• src/darwinports1.0/darwinports.tcl (modified) (3 diffs)
• tests/Makefile (modified) (2 diffs)
• tests/envvariables (added)
• tests/envvariables/Makefile (added)
• tests/envvariables/Portfile (added)
• tests/envvariables/master (added)
• tests/test-ports.conf (modified) (1 diff)

trunk/base/src/darwinports1.0/darwinports.tcl

@@ -1 +1 @@
 # darwinports.tcl
-# $Id: darwinports.tcl,v 1.212 2006/04/05 23:51:50 jberry Exp $
+# $Id: darwinports.tcl,v 1.213 2006/07/22 05:50:40 pguyot Exp $
 #
 # Copyright (c) 2002 Apple Computer, Inc.
@@ -225 +225 @@
             while {[gets $fd line] >= 0} {
                 foreach option $bootstrap_options {
-                    if {[regexp "^$option\[ \t\]+(\[A-Za-z0-9_:,\./-\]+$)" $line match val] == 1} {
+                    if {[regexp "^$option\[ \t\]+(\[A-Za-z0-9_:,\./-\].+$)" $line match val] == 1} {
                         set darwinports::$option $val
                         global darwinports::$option
@@ -435 +435 @@
                                         }
     if {[info exists extra_env]} {
-        lappend keepenvkeys ${extra_env}
-    }
-
+        set keepenvkeys [concat ${keepenvkeys} ${extra_env}]
+    }
+        
         foreach envkey [array names env] {
                 if {[lsearch $keepenvkeys $envkey] == -1} {

trunk/base/tests/Makefile

@@ -1 +1 @@
 include ../Mk/dports.autoconf.mk
 
-#SUBDIR=checksums-1 site-tags trace xcodeversion
-SUBDIR=checksums-1 site-tags xcodeversion
+SUBDIR=checksums-1 envvariables site-tags trace xcodeversion
 
 .PHONY: test
@@ -43 +42 @@
                 fi || exit 1; \
         done
+        @rm -rf /tmp/darwinports-tests/
 
 install:

trunk/base/tests/test-ports.conf

@@ -49 +49 @@
 # Rsync options
 rsync_options           "-rtzv --delete --delete-after"
+
+# Extra environment variables to keep. Any variables listed here are added
+# to the list of variables that are not removed from the environment used
+# while processing ports
+# extra_env                     KEEP_THIS THIS_TOO
+extra_env                       ENVA ENVB