/[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.25 by slords, Wed Nov 7 21:14:58 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                    printline('dark blue', 1, '    - checking stage') if $opts{d};
141                    tagpkg($pkg, 'obsolete');
142                    next;
143                }
144    
145              # Move packages from base/builds to correct area              # Move packages from base/builds to correct area
146              if ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {              elsif ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {
147                  printline('dark blue', 1, '    - checking base/builds') if $opts{d};                  printline('dark blue', 1, '    - checking base/builds') if $opts{d};
148                  my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;                  my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
149                  if ( $pkg->{nonbase} ) {                  if ( $pkg->{nonbase} ) {
# Line 248  foreach my $smever ( sort { $a <=> $b } Line 255  foreach my $smever ( sort { $a <=> $b }
255                  }                  }
256              }              }
257          }          }
         printline('bold black', 1, ' - missing stage packages') if $opts{d};  
         movepkg($_, $stage, 0) foreach grep { $_->{latest} && $_->{latest} == 1 } @pkgs;  
   
         printline('bold black', 1, ' - obsolete packages') if $opts{d};  
         movepkg($_, 'delete') foreach grep { ! rprop($_, 'base') && ! $_->{done} && ( $_->{obsolete} || ( $_->{rpm}->is_source_package && ! $_->{inuse} ) ) } @pkgs;  
   
258          printline('bold black', 1, ' - arch count check') if $opts{d};          printline('bold black', 1, ' - arch count check') if $opts{d};
259          foreach my $r ( keys %$archs ) {          foreach my $r ( keys %$archs ) {
260              foreach my $p ( keys %{$archs->{$r}} ) {              foreach my $p ( keys %{$archs->{$r}} ) {
# Line 267  foreach my $smever ( sort { $a <=> $b } Line 268  foreach my $smever ( sort { $a <=> $b }
268                  }                  }
269              }              }
270          }          }
271    
272            printline('bold black', 1, ' - missing stage packages') if $opts{d};
273            movepkg($_, $stage, 0) foreach grep { $_->{latest} && $_->{latest} == 1 } @pkgs;
274    
275            printline('bold black', 1, ' - obsolete packages') if $opts{d};
276            movepkg($_, 'delete') foreach grep { ! rprop($_, 'base') && ! $_->{done} && ( $_->{obsolete} || ( $_->{rpm}->is_source_package && ! $_->{inuse} ) ) } @pkgs;
277      }      }
278      printline('white', 0, "Finished processing.\n");      printline('white', 0, "Finished processing.\n");
279    
# Line 483  sub loadpkg { Line 490  sub loadpkg {
490                    nosig   => $nosig,                    nosig   => $nosig,
491                  };                  };
492      $sources{$srcname}++;      $sources{$srcname}++;
493      $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} ) {
494            $latest{$pkg->name} = $rpms[$#rpms] if ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm};
495        }
496  }  }
497    
498  sub loadbase {  sub loadbase {
# Line 504  sub loadbase { Line 513  sub loadbase {
513              return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}};              return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}};
514              $pkgrepo = $repo;              $pkgrepo = $repo;
515              return unless $pkg->is_source_package || $cmp;              return unless $pkg->is_source_package || $cmp;
516              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};
517              last;              last;
518          }          }
519      }      }

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