From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat, 26 Sep 2020 11:07:58 +0000 (+0200)
Subject: runone: *.no.rpm
X-Git-Url: http://git.jankratochvil.net/?p=massrebuild.git;a=commitdiff_plain;h=010e5bfc63a70e5e5f384199443288e2490b4f3d

runone: *.no.rpm
runone: Remove mock workaround fixed with mock-2.6.
runone: Keep *.resultdir.
---

diff --git a/runone b/runone
index 1ac986d..92f6718 100755
--- a/runone
+++ b/runone
@@ -24,7 +24,7 @@ for pkg in "$@";do
     continue
   fi
   #rpm -q --requires -p $srcrpm|egrep '^(gcc|clang)' || continue
-if false;then
+if true;then
   rpm2archive $srcrpm
   rm -rf $srcrpm.d
   mkdir $srcrpm.d
@@ -54,36 +54,25 @@ if false;then
      continue
    fi
    # if not pkg.endswith('.rpm'): log.error("%s doesn't appear to be an rpm - skipping", pkg)
-   mv -f resultdir/*.src.rpm ../$srcrpm.nc.rpm
+   mv -f resultdir/*.src.rpm ../$srcrpm.no.rpm
    cd ..
-  test -e $srcrpm.nc.rpm
+  test -e $srcrpm.no.rpm
   rm -rf $srcrpm.d
 else
   ln $srcrpm $srcrpm.nc.rpm
 fi
-  for ext in "" ".nc.rpm";do
+  for ext in "" ".no.rpm";do
     resultdir=$PWD/$srcrpm$ext.resultdir
     test ! -e $resultdir
     set +e
-    # --chain instead of --rebuild as otherwise -a does not work
     $mock --resultdir=$resultdir --nocheck $(
       if [ "$ext" = ".nc.rpm"  ];then echo -a https://www.jankratochvil.net/t/nocommon/;fi
       if [ "$ext" = ".dt.rpm"  ];then echo -a https://www.jankratochvil.net/t/rpmdts/  ;fi
       if [ "$ext" = ".dt5.rpm" ];then echo -a https://www.jankratochvil.net/t/rpmdts5/ ;fi
-      ) --chain $srcrpm$ext &>$srcrpm$ext.mocklog
+      ) --rebuild $srcrpm$ext &>$srcrpm$ext.mocklog
     mockrc=$?
     set -e
     test -e $resultdir
-    #rm -f $srcrpm$ext
-    # --chain ignores --resultdir
-    resultdirsrc="$(sed -n 's/^INFO: Results out to: //p' $srcrpm$ext.mocklog)"
-    if [ ! -e $resultdirsrc/*/root.log ];then
-      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
@@ -100,7 +89,8 @@ fi
     echo >$srcrpm$ext.filesize $size
     mkdir $srcrpm$ext.rpms
     mv -f $resultdir/*-debuginfo*.rpm $srcrpm$ext.rpms || :
-    rm -rf $resultdir
+#    rm -rf $resultdir
+    rm -f $resultdir/*.rpm
   done
   touch $srcrpm.done
 done