Changeset 18681


Ignore:
Timestamp:
Jul 22, 2006, 5:50:41 AM (14 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:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r17321 r18681  
    11# darwinports.tcl
    2 # $Id: darwinports.tcl,v 1.212 2006/04/05 23:51:50 jberry Exp $
     2# $Id: darwinports.tcl,v 1.213 2006/07/22 05:50:40 pguyot Exp $
    33#
    44# Copyright (c) 2002 Apple Computer, Inc.
     
    225225            while {[gets $fd line] >= 0} {
    226226                foreach option $bootstrap_options {
    227                     if {[regexp "^$option\[ \t\]+(\[A-Za-z0-9_:,\./-\]+$)" $line match val] == 1} {
     227                    if {[regexp "^$option\[ \t\]+(\[A-Za-z0-9_:,\./-\].+$)" $line match val] == 1} {
    228228                        set darwinports::$option $val
    229229                        global darwinports::$option
     
    435435                                        }
    436436    if {[info exists extra_env]} {
    437         lappend keepenvkeys ${extra_env}
    438     }
    439 
     437        set keepenvkeys [concat ${keepenvkeys} ${extra_env}]
     438    }
     439       
    440440        foreach envkey [array names env] {
    441441                if {[lsearch $keepenvkeys $envkey] == -1} {
  • trunk/base/tests/Makefile

    r13891 r18681  
    11include ../Mk/dports.autoconf.mk
    22
    3 #SUBDIR=checksums-1 site-tags trace xcodeversion
    4 SUBDIR=checksums-1 site-tags xcodeversion
     3SUBDIR=checksums-1 envvariables site-tags trace xcodeversion
    54
    65.PHONY: test
     
    4342                fi || exit 1; \
    4443        done
     44        @rm -rf /tmp/darwinports-tests/
    4545
    4646install:
  • trunk/base/tests/test-ports.conf

    r13743 r18681  
    4949# Rsync options
    5050rsync_options           "-rtzv --delete --delete-after"
     51
     52# Extra environment variables to keep. Any variables listed here are added
     53# to the list of variables that are not removed from the environment used
     54# while processing ports
     55# extra_env                     KEEP_THIS THIS_TOO
     56extra_env                       ENVA ENVB
Note: See TracChangeset for help on using the changeset viewer.