From ce63aca2b1b6a609886dee67e670147fd068d868 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 13 Oct 2020 08:36:05 +0200 Subject: [PATCH] - remove /var/lib/rpm/log directory on upgrade, rpm4 does not use it and it's existence prevents old directory removal on rebuildb --- dbupgrade.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbupgrade.sh b/dbupgrade.sh index 30c2d5c..0011a7c 100755 --- a/dbupgrade.sh +++ b/dbupgrade.sh @@ -20,12 +20,12 @@ if ! /usr/lib/rpm/rpmdb_reset -r lsn "$ROOTDIR"/var/lib/rpm/Packages ; then echo echo " /usr/lib/rpm/rpmdb_reset -r lsn /var/lib/rpm/Packages" echo " /bin/rm -f /var/lib/rpm/__db.00*" - echo " /bin/rm -f /var/lib/rpm/log/*" + echo " /bin/rm -rf /var/lib/rpm/log" echo " /usr/bin/rpmdb --rebuilddb" echo else /bin/rm --interactive=never -f "$ROOTDIR"/var/lib/rpm/__db.00* >/dev/null 2>/dev/null || : - /bin/rm --interactive=never -f "$ROOTDIR"/var/lib/rpm/log/* >/dev/null 2>/dev/null || : + /bin/rm --interactive=never -rf "$ROOTDIR"/var/lib/rpm/log >/dev/null 2>/dev/null || : if ! /usr/bin/rpmdb --rebuilddb ${ROOTDIR:+--root="$ROOTDIR"}; then echo -- 2.43.0