RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 21-Nov-2010 06:05:05 Branch: HEAD Handle: 2010112105050500 Modified files: 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.10 +6 -5 rpm/scripts/dbconvert.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/scripts/dbconvert.sh ============================================================================ $ cvs diff -u -r1.9 -r1.10 dbconvert.sh --- rpm/scripts/dbconvert.sh 21 Nov 2010 02:53:25 -0000 1.9 +++ rpm/scripts/dbconvert.sh 21 Nov 2010 05:05:05 -0000 1.10 @@ -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 [email protected]
