X-Git-Url: https://git.jankratochvil.net/?p=massrebuild.git;a=blobdiff_plain;f=runone;h=a31325e6d104f26743ae5166ae0d1ce345aa770b;hp=0eac9e09fbc47b53d3c0e91ce0932029123ec7ef;hb=021cd83bb277640e708031ee54ba7c902dfa7713;hpb=c6f6050ad9716117deda0285572545a2a1621d6a

diff --git a/runone b/runone
index 0eac9e0..a31325e 100755
--- a/runone
+++ b/runone
@@ -31,7 +31,8 @@ for pkg in "$@";do
      continue
    fi
    (echo '%global _find_debuginfo_dwz_opts %{nil}'
-    echo '%global optflags %(echo %{optflags}|sed "s/ -g / -g -fdebug-types-section /")'
+# It removes -fcommon, use redhat-rpm-config.patch instead.
+#    echo '%global optflags %(echo %{optflags}|sed "s/ -g / -g -fdebug-types-section /")'
     sed 's/^%\(\(define\|global\) *_find_debuginfo_dwz_opts\)/\1/'
    ) <$name.spec >$name.spec.new
    cp -p $name.spec     ../$srcrpm.spec
@@ -56,29 +57,30 @@ for pkg in "$@";do
     test ! -e $resultdir
     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=$?
+    $mock --resultdir=$resultdir --nocheck $(if [ -n "$ext" ];then echo -a https://www.jankratochvil.net/t/rpmdts/;fi) --chain $srcrpm$ext &>$srcrpm$ext.mocklog
+    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
     done