macros for %_ver_lt %_ver_ge

[packages/rpm.git] / dbupgrade.sh

diff --git a/dbupgrade.sh b/dbupgrade.sh
index 30c2d5c902beeb76165b12f55164c14fe855e4c1..a000935734caf47e94854e4c763421b375aa9224 100755 (executable)
--- a/dbupgrade.sh
+++ b/dbupgrade.sh
@@ -20,12 +20,13 @@ 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 || :
+       /bin/rm --interactive=never -rf "$ROOTDIR"/var/lib/rpm/tmp >/dev/null 2>/dev/null || :
 
        if ! /usr/bin/rpmdb --rebuilddb ${ROOTDIR:+--root="$ROOTDIR"}; then
                echo