diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-07 13:58:54 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 13:58:54 +0100 |
commit | 6cd75cce72c5abaa5cc64534a759ec4bf28f7eb1 (patch) | |
tree | 6180bdbf4df70b600f85e3413ada43e1c4e19f42 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | |
parent | 9a160d28d57605db98353740523d086ea5c5446d (diff) | |
parent | c3096caa14393690df2d6bdb79b144924c56f22a (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh index 90b32d0d..fc07e6fa 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -37,6 +37,6 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi |