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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-tools                    Date:   25-Jul-2004 11:50:32
  Branch: HEAD                             Handle: 2004072510503200

  Modified files:
    openpkg-tools/cmd       build.pl

  Log:
    add patch by Michael van Elst to fix the problem of rebuilding
    'openpkg' all the time in RELEASE instances

  Summary:
    Revision    Changes     Path
    1.5         +6  -6      openpkg-tools/cmd/build.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/build.pl
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 build.pl
  --- openpkg-tools/cmd/build.pl        9 Apr 2004 11:47:28 -0000       1.4
  +++ openpkg-tools/cmd/build.pl        25 Jul 2004 09:50:32 -0000      1.5
  @@ -1318,15 +1318,15 @@
   #
   # find target in map
   #
  -sub find_target ($$) {
  -    my($name, $map) = @_;
  +sub find_target ($$$) {
  +    my($name, $map, $pos) = @_;
       my($vmap) = $map->{$name};
       my(@vs);
   
       return unless $vmap;
   
       @vs = sort { vcmp($b,$a) } keys %$vmap;
  -    return $vmap->{$vs[0]}->[-1];
  +    return $vmap->{$vs[$pos]}->[-1];
   }
   
   #
  @@ -1413,7 +1413,7 @@
   
       $conflicts = target_conflicts($target, $env);
       foreach (@$conflicts) {
  -        my($t) = find_target($_, $map);
  +        my($t) = find_target($_, $map, 0);
           return $t if $t;
       }
       return;
  @@ -1741,7 +1741,7 @@
       #
       # see if a target is already installed and requires a rebuild
       #
  -    if ($t = find_target($target->{name}, $env->{installed})) {
  +    if ($t = find_target($target->{name}, $env->{installed}, -1)) {
           if (exists $env->{exclude}->{$target->{name}}) {
               print "# excluding $target->{name} (no upgrade allowed)\n";
               return;
  @@ -2312,7 +2312,7 @@
           next if $n =~ /::/;
           next if exists $map{$n};
           next unless grep { $_ ne '' } keys %{$repository->{$n}};
  -        $t = find_target($n, $repository);
  +        $t = find_target($n, $repository, 0);
           $map{$n}->{'status'} = 'NEW';
           $map{$n}->{'rel'}    = vs($t);
           push @names,$n;
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to