diff mbox

[2/2] s/HttpProxy/DebianMirrorProxy/

Message ID 1476802588-28894-3-git-send-email-konrad.wilk@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

Konrad Rzeszutek Wilk Oct. 18, 2016, 2:56 p.m. UTC 
From: Konrad Rzeszutek Wilk <konrad@osstest.dumpdata.com>

where appropiate.

When constructing Debian related items we should be using the
DebianMirrorProxy instead of all catch HttpProxy.

Or alternatively support the case where are no HttProxy at all.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 mg-debian-installer-update | 4 ++--
 mgi-common                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/mg-debian-installer-update b/mg-debian-installer-update
index 38ae782..84127ad 100755
--- a/mg-debian-installer-update
+++ b/mg-debian-installer-update
@@ -64,8 +64,8 @@  dstroot=`getconfig TftpPath`/`getconfig TftpDiBase`/
 date=`date +%Y-%m-%d`
 dst=$arch/$date-$suite
 
-case "`getconfig HttpProxy`" in
-?*)	export http_proxy=`getconfig HttpProxy` ;;
+case "`getconfig DebianMirrorProxy`" in
+?*)	export http_proxy=`getconfig DebianMirrorProxy` ;;
 esac
 
 cd $dstroot
diff --git a/mgi-common b/mgi-common
index 8a2c2d9..45cae69 100644
--- a/mgi-common
+++ b/mgi-common
@@ -27,7 +27,7 @@  fetch () {
 	# and (2) if we are explicitly using a proxy to avoid getting
 	# stale data (bearing in mind that we run this interactively only)
 	: ${mg_update_proxy=$(
-		cd $mg_update_org_pwd && getconfig HttpProxy
+		cd $mg_update_org_pwd && getconfig DebianMirrorProxy
 	)}
 	curl -s -H 'Pragma: no-cache' \
 		${mg_update_proxy+-x} ${mg_update_proxy} \