openstack/devstack
Code Issues Proposed changes

Merge "Add defaults for yum proxy variables"

Browse Source
This commit is contained in:
Jenkins 2015-03-20 14:29:54 +00:00 committed by Gerrit Code Review
commit 597fd75f41
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
functions-common
View File

@ -1072,8 +1072,8 @@ function yum_install {
# The manual check for missing packages is because yum -y assumes # The manual check for missing packages is because yum -y assumes
# missing packages are OK. See # missing packages are OK. See
# https://bugzilla.redhat.com/show_bug.cgi?id=965567 # https://bugzilla.redhat.com/show_bug.cgi?id=965567
$sudo http_proxy=$http_proxy https_proxy=$https_proxy \ $sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
no_proxy=$no_proxy \ no_proxy="${no_proxy:-}" \
${YUM:-yum} install -y "$@" 2>&1 | \ ${YUM:-yum} install -y "$@" 2>&1 | \
awk ' awk '
BEGIN { fail=0 } BEGIN { fail=0 }
@ -1095,7 +1095,8 @@ function zypper_install {
[[ "$OFFLINE" = "True" ]] && return [[ "$OFFLINE" = "True" ]] && return
local sudo="sudo" local sudo="sudo"
[[ "$(id -u)" = "0" ]] && sudo="env" [[ "$(id -u)" = "0" ]] && sudo="env"
$sudo http_proxy=$http_proxy https_proxy=$https_proxy \ $sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
no_proxy="${no_proxy:-}" \
zypper --non-interactive install --auto-agree-with-licenses "$@" zypper --non-interactive install --auto-agree-with-licenses "$@"
} }