diff options
| author | Dennis Herbrich <dennis.herbrich@hytera.de> | 2013-03-12 17:12:19 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-03-13 12:34:24 +0100 |
| commit | cd7805b5719bf67422dc9d74fb7852244e3220dc (patch) | |
| tree | 1b37c9db69ee8212e4773b2da12383cf18d66f29 /bin | |
| parent | 0993be06c8a082f9fa98c3db0ed57fb944436365 (diff) | |
| download | ptxdist-cd7805b5719bf67422dc9d74fb7852244e3220dc.tar.gz ptxdist-cd7805b5719bf67422dc9d74fb7852244e3220dc.tar.xz | |
ptxdist: setup: added proxy exception configuration
Signed-off-by: Dennis Herbrich <dennis.herbrich@hytera.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index ded63027f..95382e632 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2015,7 +2015,7 @@ setup_env() { unset $(/usr/bin/env | \ sed -n -e "s/^\([^=[:space:]]\+\)=.*$/\1/p" | \ - egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|https_proxy|ftp_proxy${whitelist})$" ) + egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|https_proxy|ftp_proxy|no_proxy${whitelist})$" ) ######## the environment is clean now ######## @@ -2163,6 +2163,9 @@ setup_config() { export ftp_proxy="${PTXCONF_SETUP_FTP_PROXY}" fi + if [ -n "${PTXCONF_SETUP_NO_PROXY}" ]; then + export no_proxy="${PTXCONF_SETUP_NO_PROXY}" + fi # # setup PARALLELMFLAGS |