From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 13 Oct 2020 06:36:05 +0000 (+0200)
Subject: - remove /var/lib/rpm/log directory on upgrade, rpm4 does not use it and it's existen... 
X-Git-Tag: auto/th/rpm-4.16.1.2-1~53
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=ce63aca2b1b6a609886dee67e670147fd068d868;hp=89c3f91ffff6eb5cb5f8825e5856e293881ece67

- remove /var/lib/rpm/log directory on upgrade, rpm4 does not use it and it's existence prevents old directory removal on rebuildb
---

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