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 07:14:10
Branch: HEAD Handle: 2010112106141000
Modified files:
rpm/scripts dbconvert.sh
Log:
- check if log file has been generated before trying to copy
- fix order of checking for db51_* vs db_*
- fix DB_VERBOSE variable
Summary:
Revision Changes Path
1.11 +8 -6 rpm/scripts/dbconvert.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/scripts/dbconvert.sh
============================================================================
$ cvs diff -u -r1.10 -r1.11 dbconvert.sh
--- rpm/scripts/dbconvert.sh 21 Nov 2010 05:05:05 -0000 1.10
+++ rpm/scripts/dbconvert.sh 21 Nov 2010 06:14:10 -0000 1.11
@@ -6,13 +6,13 @@
NEWDB="${NEWDB:-`mktemp -d -t newdb-XXXXXXXXXX`}"
DBHOME="${DBHOME:-/var/lib/rpm}"
DBFORCE=${DBFORCE:-0}
-DBVERBOSE=${DBFORCE:-1}
+DBVERBOSE=${DBVERBOSE:-1}
DBREBUILD=${DBREBUILD:-0}
DBVERSION=5.1
DBERROR=0
for db_tool in db_stat db_dump db_load db_recover; do
- tool=$(which $db_tool 2> /dev/null| which
${db_tool/db_/db${DBVERSION/./}_})
+ tool=$(which ${db_tool/db_/db${DBVERSION/./}_} || which $db_tool 2>
/dev/null)
if [ -z "$tool" -o ! -x "$tool" ]; then
echo "Unable to locate $db_tool"
DBERROR=1
@@ -146,10 +146,12 @@
echo "--> move new rpmdb files to $DBHOME"
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 "$DBHOME"/log/*
+ if [ -f "$NEWDB"/log/log.0000000001 ]; then
+ 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 "$DBHOME"/log/*
+ fi
$db_recover -h "$DBHOME"
rm -rf "$NEWDB"
else
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
