/[smeserver]/builds_bin/update_repos
ViewVC logotype

Diff of /builds_bin/update_repos

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.22 by slords, Mon Nov 5 03:10:02 2007 UTC Revision 1.24 by slords, Wed Nov 7 19:31:20 2007 UTC
# Line 128  foreach my $smever ( sort { $a <=> $b } Line 128  foreach my $smever ( sort { $a <=> $b }
128          $archs = ();          $archs = ();
129    
130          foreach my $pkg ( @pkgs ) {          foreach my $pkg ( @pkgs ) {
131              next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}} || rprop($pkg, 'stage');              next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}};
132              printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d};              printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d};
133              my $orig = 0;              my $orig = 0;
134    
135              # Find names of packages in same or higher repos              # Find names of packages in same or higher repos
136              my %names = names($pkg, @pkgs);              my %names = names($pkg, @pkgs);
137    
138                # Stage packages should never be most current
139                if ( rprop($pkg, 'stage') ) {
140                    tagpkg($pkg, 'obsolete');
141                    next;
142                }
143    
144              # Move packages from base/builds to correct area              # Move packages from base/builds to correct area
145              if ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {              elsif ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {
146                  printline('dark blue', 1, '    - checking base/builds') if $opts{d};                  printline('dark blue', 1, '    - checking base/builds') if $opts{d};
147                  my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;                  my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
148                  if ( $pkg->{nonbase} ) {                  if ( $pkg->{nonbase} ) {
# Line 483  sub loadpkg { Line 489  sub loadpkg {
489                    nosig   => $nosig,                    nosig   => $nosig,
490                  };                  };
491      $sources{$srcname}++;      $sources{$srcname}++;
492      $latest{$pkg->name} = $rpms[$#rpms] if ! $pkg->is_source_package && ( ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm} );      if ( ! $pkg->is_source_package && ! $repos->{$reponame}->{stage} ) {
493            $latest{$pkg->name} = $rpms[$#rpms] if ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm};
494        }
495  }  }
496    
497  sub loadbase {  sub loadbase {
# Line 504  sub loadbase { Line 512  sub loadbase {
512              return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}};              return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}};
513              $pkgrepo = $repo;              $pkgrepo = $repo;
514              return unless $pkg->is_source_package || $cmp;              return unless $pkg->is_source_package || $cmp;
515              return if ! $pkg->is_source_package && $pkg gt $cmp->{rpm} && rprop($cmp, 'base') && rprop($cmp, 'prio') > $repos->{$pkgrepo}->{prio};              return if ! $pkg->is_source_package && $pkg ge $cmp->{rpm} && rprop($cmp, 'base') && rprop($cmp, 'prio') > $repos->{$pkgrepo}->{prio};
516              last;              last;
517          }          }
518      }      }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed