Changeset 1174 for rpmbuild-bot

Timestamp:

Jun 7, 2017, 6:12:37 PM (8 years ago)

Author:

dmik

Message:

rpmbuild-bot: Fix capturing rpmbuild errors in -l mode.

The final message would report a successful build even if rpmbuild
failed.

File:

• rpmbuild-bot/rpmbuild-bot.sh (modified) (1 diff)

rpmbuild-bot/rpmbuild-bot.sh

@@ -254 +254 @@
   rm -f "$log"
   if [ -n "$log_to_console" ] ; then
-    "$@" 2>&1 | tee "$log"
+    # Do some magic redirection to preserve original error code
+    # (https://stackoverflow.com/questions/1221833/pipe-output-and-capture-exit-status-in-bash)
+    exec 4>&1
+    local rc=`{ { "$@" 2>&1 3>&-; printf $? 1>&3; } 4>&- | tee "$log" 1>&4; } 3>&1`
+    exec 4>&-
   else
     "$@" >"$log" 2>&1
-  fi
-  local rc=$?
+    local rc=$?
+  fi
   if [ $rc != 0 ] ; then
     log "ERROR: The following command failed with error code $rc:"