sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "yum/install-packages output cleanup"

Browse Source
This commit is contained in:
Jenkins 2017-02-07 06:34:26 +00:00 committed by Gerrit Code Review
commit cac1471cc8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/yum/bin/install-packages
View File

@ -27,6 +27,9 @@ MAP_ELEMENT=
# allow override for dnf, as shipped by default with >=F22 # allow override for dnf, as shipped by default with >=F22
YUM=${YUM:-yum} YUM=${YUM:-yum}
# save global xtrace state
_xtrace=$(set +o | grep xtrace)
SCRIPTNAME=$(basename $0) SCRIPTNAME=$(basename $0)
function show_options () { function show_options () {
echo "Usage: $SCRIPTNAME [package ...]" echo "Usage: $SCRIPTNAME [package ...]"
@ -103,7 +106,7 @@ if [ -n "$WHITELIST" ]; then
exit 0 exit 0
fi fi
echo "Running install-packages ${ACTION}. Package list: $PKGS" echo "Running install-packages ${ACTION}."
if [ "$ACTION" == "download" ]; then if [ "$ACTION" == "download" ]; then
mkdir -p $DOWNLOAD_PATH mkdir -p $DOWNLOAD_PATH
@ -130,6 +133,7 @@ if [ -n "$WHITELIST" ]; then
# point. # point.
# #
# [1] https://bugzilla.redhat.com/show_bug.cgi?id=965567 # [1] https://bugzilla.redhat.com/show_bug.cgi?id=965567
set -o xtrace
${YUM} -v -y $ACTION $EXTRA_ARGS $PKGS ${YUM} -v -y $ACTION $EXTRA_ARGS $PKGS
if [ "$ACTION" == "install" ]; then if [ "$ACTION" == "install" ]; then
@ -138,6 +142,7 @@ if [ -n "$WHITELIST" ]; then
dnf mark install $PKGS dnf mark install $PKGS
fi fi
fi fi
$_xtrace
# probably not the right place for this; but python-pip package on # probably not the right place for this; but python-pip package on
# fedora/rh calls pip "pip-python" while the rest of the work # fedora/rh calls pip "pip-python" while the rest of the work