From d7be75dcdbaa1912da59c3250f2fb7884ec665fb Mon Sep 17 00:00:00 2001
From: Jason McKenna <jason.mckenna@windriver.com>
Date: Tue, 21 Aug 2018 09:19:23 -0400
Subject: [PATCH] Pass optional args to RPM download scripts

There are a few optional arguments, include -n and -c, which should
be passed to the RPM download script (dl_rpms.sh).  Currently, they
are only passed in some calls to dl_rpms.sh.  This change adds the
args to remaining calls.

Change-Id: I661f20fa8ed81e461fcf4e25518beb66402e45ff
Signed-off-by: Jason McKenna <jason.mckenna@windriver.com>
Story: https://storyboard.openstack.org/#!/story/2003506
Task: 24784
---
 centos-mirror-tools/download_mirror.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/centos-mirror-tools/download_mirror.sh b/centos-mirror-tools/download_mirror.sh
index e74d71fd..3e739bab 100755
--- a/centos-mirror-tools/download_mirror.sh
+++ b/centos-mirror-tools/download_mirror.sh
@@ -130,13 +130,13 @@ fi
 echo "step #2: start 1st round of downloading RPMs and SRPMs with L1 match criteria..."
 #download RPMs/SRPMs from CentOS repos by "yumdownloader"
 logfile="log_download_centos_L1.txt"
-$rpm_downloader ${rpms_from_centos_repo} L1 |& tee ./logs/$logfile
+$rpm_downloader ${rpm_downloader_extra_args} ${rpms_from_centos_repo} L1 |& tee ./logs/$logfile
 retcode=${PIPESTATUS[0]}
 
 K1_logfile="log_download_rpms_from_centos_K1.txt"
 if [ $retcode -ne 1 ]; then
     # K1 step not needed. Clear any K1 logs from previous download attempts.
-    $rpm_downloader -x ./output/centos_rpms_missing_L1.txt K1 |& tee ./logs/$K1_logfile
+    $rpm_downloader ${rpm_downloader_extra_args} -x ./output/centos_rpms_missing_L1.txt K1 |& tee ./logs/$K1_logfile
 fi
 
 if [ $retcode -eq 0 ]; then
@@ -146,7 +146,7 @@ elif [ $retcode -eq 1 ]; then
     if [ -e "./output/centos_rpms_missing_L1.txt" ]; then
 
         echo "start 2nd round of downloading Binary RPMs with K1 match criteria..."
-        $rpm_downloader ./output/centos_rpms_missing_L1.txt K1 centos |& tee ./logs/$K1_logfile
+        $rpm_downloader ${rpm_downloader_extra_args} ./output/centos_rpms_missing_L1.txt K1 centos |& tee ./logs/$K1_logfile
         retcode=${PIPESTATUS[0]}
         if [ $retcode -eq 0 ]; then
             echo "finish 2nd round of RPM downloading successfully!"