commit 2cb3db338a17bd26fef1f56fc155be5d01a6ef7e
author Jenkins <jenkins@review.openstack.org> Mon Jan 11 17:01:33 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 11 17:01:33 2016 +0000
tree 1a3967e0315924419c90f8754d16c5a213677b60
parent 5453cdd392148db4af45fd950542085c2083de09
parent 2babf3963f4eea8558b0c287c51e6faeb7069c70

Merge "Don't die when yum fails."

functions-common

diff --git a/functions-common b/functions-common
index c6bf648..dbf605c 100644
--- a/functions-common
+++ b/functions-common
@@ -1334,13 +1334,17 @@
             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