Changeset 14976 for trunk/base


Ignore:
Timestamp:
Nov 7, 2005, 3:18:56 PM (15 years ago)
Author:
jberry
Message:

Add some http proxy variables to those not to sanitize from the DP environment.
Also add a new ports.conf variable, extra_env, which can be used to specify
additional environment to not sanitize.

Bug: 5648
Submitted by: Kogule Ryo
Reviewed by: jberry@
Approved by: jberry@
Obtained from:

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/doc/ports.conf.in

    r14485 r14976  
    5656# older mac ox X systems will default to systemstarter.
    5757startupitem_type        default
     58
     59# Extra environment variables to keep. Any variables listed here are added
     60# to the list of variables that are not removed from the environment used
     61# while processing ports
     62# extra_env                     KEEP_THIS THIS_TOO
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r14485 r14976  
    11# darwinports.tcl
    2 # $Id: darwinports.tcl,v 1.198 2005/10/08 21:29:35 jberry Exp $
     2# $Id: darwinports.tcl,v 1.199 2005/11/07 15:18:56 jberry Exp $
    33#
    44# Copyright (c) 2002 Apple Computer, Inc.
     
    3838namespace eval darwinports {
    3939    namespace export bootstrap_options portinterp_options open_dports ui_priorities
    40     variable bootstrap_options "portdbpath libpath binpath auto_path sources_conf prefix portdbformat portinstalltype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask variants_conf rsync_server rsync_options rsync_dir startupitem_type xcodeversion xcodebuildcmd"
     40    variable bootstrap_options "portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat portinstalltype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask variants_conf rsync_server rsync_options rsync_dir startupitem_type xcodeversion xcodebuildcmd"
    4141    variable portinterp_options "portdbpath portpath portbuildpath auto_path prefix portsharepath registry.path registry.format registry.installtype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server rsync_options rsync_dir startupitem_type"
    4242    # deferred options are only computed when needed.
     
    173173        global darwinports::autoconf::dports_conf_path
    174174        global darwinports::bootstrap_options
     175        global darwinports::extra_env
    175176        global darwinports::portconf
    176177        global darwinports::portdbpath
     
    430431                          LD_PREBIND_ALLOW_OVERLAP MASTER_SITE_LOCAL
    431432                          PATCH_SITE_LOCAL PATH PORTSRC TMP TMPDIR USER GROUP
    432         }
     433                          http_proxy https_proxy ftp_proxy all_proxy no_proxy
     434        }
     435    if {[info exists extra_env]} {
     436        lappend keepenvkeys ${extra_env}
     437    }
    433438
    434439        foreach envkey [array names env] {
Note: See TracChangeset for help on using the changeset viewer.