starlingx/tools
Code Issues Proposed changes

Merge "failmoved logs polluted by non-errors"

Browse Source
This commit is contained in:
Zuul 2018-11-27 16:09:56 +00:00 committed by Gerrit Code Review
commit c6d31e1acd
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
centos-mirror-tools/dl_rpms.sh
View File

@ -242,7 +242,6 @@ download () {
fi fi
else else
echo "Already have $dest_dir/$rpm_name" echo "Already have $dest_dir/$rpm_name"
echo "already_there_srpm:$rpm_name" >> $LOG
fi fi
echo echo
done done

16
centos-mirror-tools/utils.sh
View File

@ -65,7 +65,14 @@ get_url() {
fi fi
else else
_url_cmd="$(get_yum_command $_name $_level)" _url_cmd="$(get_yum_command $_name $_level)"
_ret="$($_url_cmd --url)"
# When we add --url to the yum download command,
# --archlist is no longer enforced. Multiple
# url's might be returned. So use grep to
# filter urls for the desitered arch.
local arr=( $(split_filename $_name) )
local arch=${arr[3]}
_ret="$($_url_cmd --url | grep "[.]$arch[.]rpm$")"
fi fi
echo "$_ret" echo "$_ret"
} }
@ -139,14 +146,17 @@ process_result() {
mkdir -p $dest_dir mkdir -p $dest_dir
fi fi
echo "url_srpm:$url" >> $LOG echo "url_srpm:$url"
if ! mv -f $sfile* $dest_dir ; then if ! mv -f $sfile* $dest_dir ; then
echo "FAILED to move $rpm_name" echo "FAILED to move $rpm_name"
echo "fail_move_srpm:$rpm_name" >> $LOG echo "fail_move_srpm:$rpm_name" >> $LOG
return 1
fi fi
echo "found_srpm:$rpm_name" >> $LOG
echo "found_srpm:$rpm_name"
echo $rpm_name >> $FOUND_SRPMS echo $rpm_name >> $FOUND_SRPMS
return 0
} }