Ubuntu Developer Tools

Merge lp:~smoser/ubuntu-dev-tools/bad-http-proxy-logic into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

  1. bad-http-proxy-logic
  2. Merge into trunk
Proposed by Scott Moser
Status: Merged
Merged at revision: 1254
Proposed branch: lp:~smoser/ubuntu-dev-tools/bad-http-proxy-logic
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
mk-sbuild (+2/-2)
To merge this branch: bzr merge lp:~smoser/ubuntu-dev-tools/bad-http-proxy-logic
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+84898@code.launchpad.net

Description of the change

Fix bad logic.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Indeed, this was a ba logic. Looks good! approving and merging. Thanks Scott :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mk-sbuild'
2--- mk-sbuild 2011-11-29 09:42:40 +0000
3+++ mk-sbuild 2011-12-08 07:32:24 +0000
4@@ -480,9 +480,9 @@
5 fi
6
7 # if http_proxy is set in the environment (even empty) set 'proxy' to it
8-[ "$proxy" = "_unset_" -a "${DEBOOTSTRAP_PROXY-xx}" = "xx" ] &&
9+[ "$proxy" = "_unset_" -a "${DEBOOTSTRAP_PROXY-xx}" != "xx" ] &&
10 proxy=${DEBOOTSTRAP_PROXY}
11-[ "$proxy" = "_unset_" -a "${http_proxy-xx}" = "xx" ] && proxy=${http_proxy}
12+[ "$proxy" = "_unset_" -a "${http_proxy-xx}" != "xx" ] && proxy=${http_proxy}
13 if [ "$proxy" = "_unset_" ]; then
14 _out=$(apt-config shell x Acquire::HTTP::Proxy) &&
15 _out=$(sh -c 'eval $1 && echo $x' -- "$_out") && [ -n "$_out" ] &&

Subscribers

People subscribed via source and target branches

to status/vote changes: