RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 21-Nov-2010 06:05:18
Branch: rpm-5_3 Handle: 2010112105051800
Modified files: (Branch: rpm-5_3)
rpm/scripts dbconvert.sh
Log:
- only copy 'Packages' and log file from new rpmdb created..
- fix sed usage on correct path
Summary:
Revision Changes Path
1.1.2.11 +6 -5 rpm/scripts/dbconvert.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/scripts/dbconvert.sh
============================================================================
$ cvs diff -u -r1.1.2.10 -r1.1.2.11 dbconvert.sh
--- rpm/scripts/dbconvert.sh 21 Nov 2010 02:53:54 -0000 1.1.2.10
+++ rpm/scripts/dbconvert.sh 21 Nov 2010 05:05:18 -0000 1.1.2.11
@@ -66,7 +66,7 @@
echo "Converting system database."
rm -rf "$NEWDB"
-mkdir -p "$NEWDB"/{log,tmp}
+mkdir -p {"$DBHOME","$NEWDB"}/{log,tmp}
if [ "$DBHOME" != "/var/lib/rpm" ]; then
if [ -f /var/lib/rpm/DB_CONFIG ]; then
cp /var/lib/rpm/DB_CONFIG "$NEWDB/DB_CONFIG"
@@ -144,13 +144,14 @@
test -f "$DBHOME/$db" && mv "$DBHOME/$db" "$BACKUP/$db"
done
echo "--> move new rpmdb files to $DBHOME"
- rm -rf "$DBHOME"/{log,tmp}
- mv -f "$NEWDB"/* "$DBHOME"
- rmdir "$NEWDB"
+ rm -f "$DBHOME"/log/*
+ mv "$NEWDB"/Packages "$DBHOME"
+ mv "$NEWDB"/log/* "$DBHOME"/log
# log files will contain paths to original path where created, so need to
# fix these, or db_recover will PANIC
- sed -e "s#$NEWDB#$DBHOME#g" -i log/*
+ sed -e "s#$NEWDB#$DBHOME#g" -i "$DBHOME"/log/*
$db_recover -h "$DBHOME"
+ rm -rf "$NEWDB"
else
echo "Conversion failed"
fi
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
