[lxc-devel] [lxc/lxc] 4eb706: download: Fix previous change

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 4eb706b3ce9891f86ff3f9b5b5d063922df9f6b6
      https://github.com/lxc/lxc/commit/4eb706b3ce9891f86ff3f9b5b5d063922df9f6b6
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M templates/lxc-download.in

  Log Message:
  -----------
  download: Fix previous change

The previous change to support http proxies only worked when http_proxy
was set... Instead add some detection code and only use :80 when using
http_proxy.

That's a bit of a workaround, but it's the only way I could find to get
GPG to work with http_proxy.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 207bf0e475f1dc6e9a2dac2cee3a209b56427855
      https://github.com/lxc/lxc/commit/207bf0e475f1dc6e9a2dac2cee3a209b56427855
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M templates/lxc-alpine.in
    M templates/lxc-altlinux.in
    M templates/lxc-archlinux.in
    M templates/lxc-busybox.in
    M templates/lxc-centos.in
    M templates/lxc-cirros.in
    M templates/lxc-debian.in
    M templates/lxc-download.in
    M templates/lxc-fedora.in
    M templates/lxc-gentoo.in
    M templates/lxc-openmandriva.in
    M templates/lxc-opensuse.in
    M templates/lxc-oracle.in
    M templates/lxc-plamo.in
    M templates/lxc-sshd.in
    M templates/lxc-ubuntu-cloud.in
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  templates: Make sure usual locations are in PATH

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/ca0abdee0326...207bf0e475f1