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 10:46:49
  Branch: HEAD                             Handle: 2002111309464900

  Modified files:
    openpkg-re              openpkg-build

  Log:
    use oldpackage option to force replacement of existing package

  Summary:
    Revision    Changes     Path
    1.9         +5  -4      openpkg-re/openpkg-build
  ____________________________________________________________________________

  Index: openpkg-re/openpkg-build
  ============================================================
  $ cvs diff -u -r1.8 -r1.9 openpkg-build
  --- openpkg-re/openpkg-build  13 Nov 2002 09:38:16 -0000      1.8
  +++ openpkg-re/openpkg-build  13 Nov 2002 09:46:49 -0000      1.9
  @@ -768,7 +768,7 @@
   sub print_list1 ($$$$@) {
       my($list,$c,$url,$uncond,$with) = @_;
       my($spkg,$bpkg);
  -    my($def);
  +    my($opt);
   
       $url .= '/' unless $url =~ m{/$}s;
   
  @@ -787,10 +787,11 @@
           if ($uncond || !-f $bpkg || $_->{REBUILD} ||
               !target_suitable(binary_target($_, $bpkg),$with)) {
   
  -            $def = make_defines($_->{OPTIONS}, $with);
  -            print "$RPM$def --rebuild $url$spkg || exit 1\n";
  +            $opt = make_defines($_->{OPTIONS}, $with);
  +            print "$RPM$opt --rebuild $url$spkg || exit 1\n";
           }
  -        print "$RPM -Uvh $bpkg\n";
  +        $opt = $_->{REBUILD} ? ' --oldpackage' : '';
  +        print "$RPM$opt -Uvh $bpkg\n";
       }
   }
   
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to