diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-08 13:27:00 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-08 13:27:00 +0200 |
| commit | db4846a6501c3c1ba54c71e932a44faec1af9ae7 (patch) | |
| tree | fd0c7c39b2079c5674e3af613ff2fcb28f85d9ce | |
| parent | 4f2462c9e7393387a8a883ba766b10b8864450fd (diff) | |
adt-build-lxd: Disable apt proxy configuration with ADT_APT_PROXY=="none"
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | tools/adt-build-lxd | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a71cb6f..a6e649f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ autopkgtest (3.20.3) UNRELEASED; urgency=medium mode that actually allows nested QEMU with current QEMU versions. * adt-build-lxd: Force-delete preparation container at the end, even if it is running. + * adt-build-lxd: Disable apt proxy configuration with ADT_APT_PROXY=="none". -- Martin Pitt <mpitt@debian.org> Tue, 05 Apr 2016 22:49:49 +0200 diff --git a/tools/adt-build-lxd b/tools/adt-build-lxd index 61be384..58dbb0e 100755 --- a/tools/adt-build-lxd +++ b/tools/adt-build-lxd @@ -57,7 +57,7 @@ proxy_detect() { setup() { # set up apt proxy for the container - if [ -n "${ADT_APT_PROXY:-}" ]; then + if [ -n "${ADT_APT_PROXY:-}" ] && [ "$ADT_APT_PROXY" != "none" ]; then echo "Acquire::http::Proxy \"$ADT_APT_PROXY\";" | lxc file push - "$CONTAINER/etc/apt/apt.conf.d/01proxy" # work around LP#1548878 lxc exec "$CONTAINER" -- chmod 644 /etc/apt/apt.conf.d/01proxy |