- cleanup upgrade path from rpm5

[packages/rpm.git] / dbupgrade.sh

diff --git a/dbupgrade.sh b/dbupgrade.sh
index 2d403b563ebdf05bddab1dbf5bc531a5c1bd83df..30c2d5c902beeb76165b12f55164c14fe855e4c1 100755 (executable)
--- a/dbupgrade.sh
+++ b/dbupgrade.sh
@@ -12,25 +12,25 @@ if [ "$1" = "-r" ]; then
        fi
 fi
 
-if ! /usr/lib/rpm/bin/rpmdb_reset -r lsn "$ROOTDIR"/var/lib/rpm/Packages ; then
+if ! /usr/lib/rpm/rpmdb_reset -r lsn "$ROOTDIR"/var/lib/rpm/Packages ; then
        echo
        echo "rpm database conversion failed!"
        echo
        echo "You have to run:"
        echo
-       echo "  /usr/lib/rpm/bin/rpmdb_reset -r lsn /var/lib/rpm/Packages"
+       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 "  /usr/lib/rpm/bin/dbconvert --rebuilddb"
+       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 || :
 
-       if ! /usr/lib/rpm/bin/dbconvert --rebuilddb ${ROOTDIR:+--root="$ROOTDIR"}; then
+       if ! /usr/bin/rpmdb --rebuilddb ${ROOTDIR:+--root="$ROOTDIR"}; then
                echo
                echo "rpm database conversion failed!"
-               echo "You have to run /usr/lib/rpm/bin/dbconvert manually"
+               echo "You have to run /usr/bin/rpmdb manually"
                echo
        fi
 fi