From ebc7fa49c221f02fb484e1bc4d3dc88ac5aaf374 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 May 2018 08:00:26 +0200 Subject: workaround for rhbz #1577747 --- buildfct | 6 +++--- mkrepo | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/buildfct b/buildfct index caf8903..f8cd6b2 100644 --- a/buildfct +++ b/buildfct @@ -476,19 +476,19 @@ if [ -f "$1" ]; then for i in 28 27 26 do echo -n "" - (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")& + (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (71) fc$i Ok." || echo "fc$1 Error !")& pids="$pids $!" done for i in 25 do echo -n "" - (mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")& + (mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo "$(date +%X) (71) fc$i Ok." || echo "fc$1 Error !")& pids="$pids $!" done for i in 7 6 do echo -n "" - (mock $quiet --configdir=$mocketc -r el${i}x71 rebuild $1 && echo "$(date +%X) (70) el$i Ok." || echo "el$i Error !")& + (mock $quiet --configdir=$mocketc -r el${i}x71 rebuild $1 && echo "$(date +%X) (71) el$i Ok." || echo "el$i Error !")& pids="$pids $!" done wait $pids diff --git a/mkrepo b/mkrepo index 2e2f854..2d8dd9e 100755 --- a/mkrepo +++ b/mkrepo @@ -49,6 +49,9 @@ cache=/home/rpmbuild/site/rpms/.createrepocache/$nom mkdir -p $cache check=sha256 if [ "$dis" == "fedora" -a "$ver" -ge 27 ]; then + # See: https://bugzilla.redhat.com/show_bug.cgi?id=1577747 + echo "+ Nettoyage" + rm -rf repodata echo "+ Génération repodata (createrepo_c, $check)" createrepo_c --workers 4 \ --cachedir $cache \ @@ -56,7 +59,7 @@ if [ "$dis" == "fedora" -a "$ver" -ge 27 ]; then --retain-old-md 1 \ --changelog-limit 3 \ --compress-type=bz2 \ - --database . + --database $(pwd) else echo "+ Génération repodata (createrepo, $check)" createrepo --workers 4 \ -- cgit