download_mirror: fix failure with custom yum.conf
When using upstream only and a custom yum.conf the wrong configuration is sent to the lower_level_rpm_downloader script. Closes-Bug: 1876216 Change-Id: I442a4fbddabc223cd0f27df329c04cad7bd159d4 Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
parent
f7a7d7b8c1
commit
757d64a13d
@ -463,7 +463,15 @@ for key in "${!layer_pkg_urls[@]}"; do
|
|||||||
#download RPMs/SRPMs from CentOS repos by "yumdownloader"
|
#download RPMs/SRPMs from CentOS repos by "yumdownloader"
|
||||||
level=L1
|
level=L1
|
||||||
logfile=$(generate_log_name $list $level)
|
logfile=$(generate_log_name $list $level)
|
||||||
llrd_extra_args="-c ${TEMP_DIR}/yum.conf"
|
if ! dl_from_stx; then
|
||||||
|
# Not using stx mirror
|
||||||
|
if [ $use_system_yum_conf -eq 0 ]; then
|
||||||
|
# Use provided yum.conf unaltered.
|
||||||
|
llrd_extra_args="-c ${alternate_yum_conf}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
llrd_extra_args="-c ${TEMP_DIR}/yum.conf"
|
||||||
|
fi
|
||||||
echo "$lower_layer_rpm_downloader -l ${lower_layer} -b ${build_type} -r $(dirname $url) ${llrd_extra_args} ${list} ${level}"
|
echo "$lower_layer_rpm_downloader -l ${lower_layer} -b ${build_type} -r $(dirname $url) ${llrd_extra_args} ${list} ${level}"
|
||||||
$lower_layer_rpm_downloader -l ${lower_layer} -b ${build_type} -r $(dirname $url) ${llrd_extra_args} ${list} ${level} |& tee $logfile
|
$lower_layer_rpm_downloader -l ${lower_layer} -b ${build_type} -r $(dirname $url) ${llrd_extra_args} ${list} ${level} |& tee $logfile
|
||||||
local_retcode=${PIPESTATUS[0]}
|
local_retcode=${PIPESTATUS[0]}
|
||||||
|
Loading…
Reference in New Issue
Block a user