--- builds_bin/update_repos 2007/11/05 03:10:02 1.22 +++ builds_bin/update_repos 2007/11/05 14:51:28 1.23 @@ -128,15 +128,21 @@ foreach my $smever ( sort { $a <=> $b } $archs = (); foreach my $pkg ( @pkgs ) { - 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}}; printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d}; my $orig = 0; # Find names of packages in same or higher repos my %names = names($pkg, @pkgs); + # Stage packages should never be most current + if ( rprop($pkg, 'stage') ) { + tagpkg($pkg, 'obsolete'); + next; + } + # Move packages from base/builds to correct area - if ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) { + elsif ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) { printline('dark blue', 1, ' - checking base/builds') if $opts{d}; my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1; if ( $pkg->{nonbase} ) {