openstack/devstack
Code Issues Proposed changes

Merge "Detect missing packages with yum"

Browse Source
This commit is contained in:
Jenkins 2014-03-10 15:47:05 +00:00 committed by Gerrit Code Review
commit 0c76039622
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/rpms/glance
View File

@ -13,6 +13,6 @@ python-lxml #dist:f18,f19,f20,rhel7
python-paste-deploy #dist:f18,f19,f20,rhel7 python-paste-deploy #dist:f18,f19,f20,rhel7
python-routes python-routes
python-sqlalchemy python-sqlalchemy
python-wsgiref python-wsgiref #dist:f18,f19,f20
pyxattr pyxattr
zlib-devel # testonly zlib-devel # testonly

17
functions-common
View File

@ -938,9 +938,24 @@ function yum_install {
[[ "$OFFLINE" = "True" ]] && return [[ "$OFFLINE" = "True" ]] && return
local sudo="sudo" local sudo="sudo"
[[ "$(id -u)" = "0" ]] && sudo="env" [[ "$(id -u)" = "0" ]] && sudo="env"
# The manual check for missing packages is because yum -y assumes
# missing packages are OK. See
# https://bugzilla.redhat.com/show_bug.cgi?id=965567
$sudo http_proxy=$http_proxy https_proxy=$https_proxy \ $sudo http_proxy=$http_proxy https_proxy=$https_proxy \
no_proxy=$no_proxy \ no_proxy=$no_proxy \
yum install -y "$@" yum install -y "$@" 2>&1 | \
awk '
BEGIN { fail=0 }
/No package/ { fail=1 }
{ print }
END { exit fail }' || \
die $LINENO "Missing packages detected"
# also ensure we catch a yum failure
if [[ ${PIPESTATUS[0]} != 0 ]]; then
die $LINENO "Yum install failure"
fi
} }
# zypper wrapper to set arguments correctly # zypper wrapper to set arguments correctly