commit ed9487a885caf81b9283f39702261d91c94ac393
author Davanum Srinivas (dims) <davanum@gmail.com> Mon Jan 11 21:20:34 2016 +0000
committer Surojit Pathak <suro@yahoo-inc.com> Tue Jan 12 18:57:37 2016 +0000
tree d67abab37bc44dc4162ab704d668ecce00ead9ef
parent 2cb3db338a17bd26fef1f56fc155be5d01a6ef7e

Revert "Don't die when yum fails."

This reverts commit 2babf3963f4eea8558b0c287c51e6faeb7069c70.

This breaks oslo.messaging jobs:
http://logs.openstack.org/32/265932/1/check/gate-oslo.messaging-dsvm-functional-amqp1-centos7/f5f3eb9/console.html#_2016-01-11_20_03_33_162

@kgiusti reports that PIPESTATUS[0] is always 1 on his centos7 box

Change-Id: I013c22a3545f22c79a0616b4a98622d41bb17d77

functions-common

diff --git a/functions-common b/functions-common
index dbf605c..c6bf648 100644
--- a/functions-common
+++ b/functions-common
@@ -1334,17 +1334,13 @@
             BEGIN { fail=0 }
             /No package/ { fail=1 }
             { print }
-            END { exit fail }'
-        result=$?
+            END { exit fail }' || \
+                die $LINENO "Missing packages detected"
 
-    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
+    # also ensure we catch a yum failure
+    if [[ ${PIPESTATUS[0]} != 0 ]]; then
+        die $LINENO "${YUM:-yum} install failure"
     fi
-    return $result
 }
 
 # zypper wrapper to set arguments correctly