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:   15-Nov-2010 23:52:26
  Branch: HEAD                             Handle: 2010111522522500

  Modified files:
    rpm/scripts             dbconvert.sh

  Log:
    don't return error value when db has already been converted

  Summary:
    Revision    Changes     Path
    1.4         +1  -1      rpm/scripts/dbconvert.sh
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/scripts/dbconvert.sh
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 dbconvert.sh
  --- rpm/scripts/dbconvert.sh  12 Nov 2010 05:02:46 -0000      1.3
  +++ rpm/scripts/dbconvert.sh  15 Nov 2010 22:52:25 -0000      1.4
  @@ -17,7 +17,7 @@
   # Database is assumed to be converted, so let's ditch it
   if [ -n "$($DB_STAT -f -d $DBHOME/Packages |grep 'Btree magic number')" -a \
        -n "$(rpm -qa)" -a -n "$(rpm -q rpm)" ]; then
  -    exit 1
  +    exit 0
   fi
   
   DB_DUMP="$(which db51_dump 2> /dev/null)"
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to