Merge "Don't die when yum fails."
This commit is contained in:
commit
2cb3db338a
@ -1334,13 +1334,17 @@ function yum_install {
|
||||
BEGIN { fail=0 }
|
||||
/No package/ { fail=1 }
|
||||
{ print }
|
||||
END { exit fail }' || \
|
||||
die $LINENO "Missing packages detected"
|
||||
END { exit fail }'
|
||||
result=$?
|
||||
|
||||
# also ensure we catch a yum failure
|
||||
if [[ ${PIPESTATUS[0]} != 0 ]]; then
|
||||
die $LINENO "${YUM:-yum} install failure"
|
||||
if [ $result != 0 ]; then
|
||||
echo $LINENO "Missing packages detected"
|
||||
elif [[ ${PIPESTATUS[0]} != 0 ]]; then
|
||||
# also ensure we catch a yum failure
|
||||
echo $LINENO "${YUM:-yum} install failure"
|
||||
result=1
|
||||
fi
|
||||
return $result
|
||||
}
|
||||
|
||||
# zypper wrapper to set arguments correctly
|
||||
|
Loading…
Reference in New Issue
Block a user