Browse code

Merge "Add defaults for yum proxy variables"

Jenkins authored on 2015/03/20 23:29:54
Showing 1 changed files
... ...
@@ -1072,8 +1072,8 @@ function yum_install {
1072 1072
     # The manual check for missing packages is because yum -y assumes
1073 1073
     # missing packages are OK.  See
1074 1074
     # https://bugzilla.redhat.com/show_bug.cgi?id=965567
1075
-    $sudo http_proxy=$http_proxy https_proxy=$https_proxy \
1076
-        no_proxy=$no_proxy \
1075
+    $sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
1076
+        no_proxy="${no_proxy:-}" \
1077 1077
         ${YUM:-yum} install -y "$@" 2>&1 | \
1078 1078
         awk '
1079 1079
             BEGIN { fail=0 }
... ...
@@ -1095,7 +1095,8 @@ function zypper_install {
1095 1095
     [[ "$OFFLINE" = "True" ]] && return
1096 1096
     local sudo="sudo"
1097 1097
     [[ "$(id -u)" = "0" ]] && sudo="env"
1098
-    $sudo http_proxy=$http_proxy https_proxy=$https_proxy \
1098
+    $sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
1099
+        no_proxy="${no_proxy:-}" \
1099 1100
         zypper --non-interactive install --auto-agree-with-licenses "$@"
1100 1101
 }
1101 1102