Workaround mock --resultdir:

[massrebuild.git] / runone

diff --git a/runone b/runone
index 71a49f0..022d0e5 100755 (executable)
--- a/runone
+++ b/runone
@@ -57,28 +57,28 @@ for pkg in "$@";do
     set +e
     # --chain instead of --rebuild as otherwise -a does not work
     $mock --resultdir=$resultdir --nocheck $(: -a https://people.redhat.com/jkratoch/dwzrepo/ ) --chain $srcrpm$ext &>$srcrpm$ext.mocklog
-    rc=$?
+    mockrc=$?
     set -e
     test -e $resultdir
     #rm -f $srcrpm$ext
-    if [ $rc -ne 0 ];then
-      touch $srcrpm$ext.mockfail
-      break
-    fi
     # --chain ignores --resultdir
     resultdirsrc="$(sed -n 's/^INFO: Results out to: //p' $srcrpm$ext.mocklog)"
     if [ ! -e $resultdirsrc/*/root.log ];then
-      touch $srcrpm$ext.mockrfail
+      touch $srcrpm$ext.mockfail
       break
     fi
     # With --chain $resultdir contains just some small *.log files.
     rm -rf $resultdir
     mv `dirname $resultdirsrc/*/root.log` $resultdir
+    if [ $mockrc -ne 0 ];then
+      touch $srcrpm$ext.mockfail
+      break
+    fi
     echo >$srcrpm$ext.rpmsize $(du -sbc /dev/null $resultdir/*-debuginfo*.rpm|tail -n1|awk '{print $1}')
     size=0
     for i in $resultdir/*-debuginfo*.rpm;do
       if [ -e "$i" ];then
-       sizethis="$(rpm -q --qf '%{size}' -p $i)"
+       sizethis="$(rpm -q --qf '%{longsize}' -p $i)"
        [[ "$sizethis" =~ ^[0-9]+$ ]]
        size=$[$size+$sizethis]
       fi