--- builds_bin/update_repos 2007/12/23 22:24:41 1.35 +++ builds_bin/update_repos 2008/01/22 20:23:58 1.36 @@ -234,6 +234,7 @@ foreach my $smever ( sort { $a <=> $b } } $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; $cmp->{repo} = $dest; + $track{repo} = $dest unless $dest eq $track{repo}; } if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { $reposrc{$cmp->{repo}}->{srpm} = $cmp; @@ -249,7 +250,31 @@ foreach my $smever ( sort { $a <=> $b } $track{svr} = $cmp->{svr}; } } elsif ( ! $repos->{$cmp->{repo}}->{base} ) { - $cmp->{delete}++; + if ( $repos->{$cmp->{repo}}->{orig} ) { + $srpm = $cmp if ! $srpm && $cmp->{src}; + my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2; + $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms}); + $dest = $devel1 if verrel($cmp, $dest, \%counts); + unless ( verrel($cmp, $dest, \%counts) ) { + push @{$cmp->{repos}}, $dest; + if ( $repos->{$cmp->{repo}}->{orig} ) { + $orig{$cmp->{nvra}}++; + } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { + $reposrc{$cmp->{repo}}->{srpm} = $cmp; + } else { + $cmp->{delete}++; + } + $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; + $cmp->{repo} = $dest; + if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { + $reposrc{$cmp->{repo}}->{srpm} = $cmp; + } + } else { + $cmp->{delete}++; + } + } else { + $cmp->{delete}++; + } } } unless ( $repos->{$cmp->{repo}}->{orig} || ( $cmp->{delete} && ! $cmp->{repos} ) ) {