Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-09 16:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

mk-sbuild: fix embarrasing bad logic error in http_proxy usage

Browse Source 
The logic here is simply wrong, and it would result in setting
proxy to empty value if DEBOOTSTRAP_PROXY or http_proxy was
non-empty.
This commit is contained in:
Scott Moser 2011-12-08 02:23:09 -05:00
parent 671fcab5c8
commit 3f08738b67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk-sbuild
View File

@ -480,9 +480,9 @@ if [ -n "$DEBOOTSTRAP_EXCLUDE" ] ; then
fi fi
# if http_proxy is set in the environment (even empty) set 'proxy' to it # if http_proxy is set in the environment (even empty) set 'proxy' to it
[ "$proxy" = "_unset_" -a "${DEBOOTSTRAP_PROXY-xx}" = "xx" ] && [ "$proxy" = "_unset_" -a "${DEBOOTSTRAP_PROXY-xx}" != "xx" ] &&
proxy=${DEBOOTSTRAP_PROXY} proxy=${DEBOOTSTRAP_PROXY}
[ "$proxy" = "_unset_" -a "${http_proxy-xx}" = "xx" ] && proxy=${http_proxy} [ "$proxy" = "_unset_" -a "${http_proxy-xx}" != "xx" ] && proxy=${http_proxy}
if [ "$proxy" = "_unset_" ]; then if [ "$proxy" = "_unset_" ]; then
_out=$(apt-config shell x Acquire::HTTP::Proxy) && _out=$(apt-config shell x Acquire::HTTP::Proxy) &&
_out=$(sh -c 'eval $1 && echo $x' -- "$_out") && [ -n "$_out" ] && _out=$(sh -c 'eval $1 && echo $x' -- "$_out") && [ -n "$_out" ] &&