[packages/rpm/rpm.org] - remove /var/lib/rpm/log directory on upgrade, rpm4 does not use it and it's existence prevents old

[baggins]

commit ce63aca2b1b6a609886dee67e670147fd068d868
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date:   Tue Oct 13 08:36:05 2020 +0200

    - 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/ce63aca2b1b6a609886dee67e670147fd068d868

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit