OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re                       Date:   13-Nov-2002 11:10:04
  Branch: HEAD                             Handle: 2002111310100400

  Modified files:
    openpkg-re              openpkg-build

  Log:
    use --force to poke over existing packages

  Summary:
    Revision    Changes     Path
    1.10        +11 -2      openpkg-re/openpkg-build
  ____________________________________________________________________________

  Index: openpkg-re/openpkg-build
  ============================================================
  $ cvs diff -u -r1.9 -r1.10 openpkg-build
  --- openpkg-re/openpkg-build  13 Nov 2002 09:46:49 -0000      1.9
  +++ openpkg-re/openpkg-build  13 Nov 2002 10:10:04 -0000      1.10
  @@ -616,9 +616,12 @@
               if (!$env->{upgrade}) {
                   print "# $target->{name} is already installed\n";
                   return;
  +            } else {
  +                print "# forced upgrading $target->{name}\n";
               }
  +        } else {
  +            print "# rebuilding $target->{name}\n";
           }
  -        print "# rebuilding $target->{name}\n";
           $target->{REBUILD} = 1;
       }
   
  @@ -790,7 +793,13 @@
               $opt = make_defines($_->{OPTIONS}, $with);
               print "$RPM$opt --rebuild $url$spkg || exit 1\n";
           }
  -        $opt = $_->{REBUILD} ? ' --oldpackage' : '';
  +
  +        #
  +        # if package exist force rpm to copy over new files
  +        # better than erasing everything and losing configuration
  +        # files
  +        #
  +        $opt = $_->{REBUILD} ? ' --force' : '';
           print "$RPM$opt -Uvh $bpkg\n";
       }
   }
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to