--- builds_bin/update_repos 2010/02/24 18:14:55 1.54 +++ builds_bin/update_repos 2010/02/24 18:17:52 1.55 @@ -260,20 +260,18 @@ foreach my $ver ( sort { $a <=> $b } key 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); - if ( $cmp->{src} && ! $reposrc{$dest} ) { - $cmp->{delete}++; - } elsif ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) { - unless ( $repos->{$cmp->{repo}}->{base} ) { - my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel}; - qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; + unless ( $cmp->{src} && ! $reposrc{$dest} ) { + if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) { + unless ( $repos->{$cmp->{repo}}->{base} ) { + my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel}; + qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; + } + push @{$cmp->{repos}}, $dest; + $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; + $cmp->{repo} = $dest; + $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src}; + $orig{$cmp->{nvra}}++; } - push @{$cmp->{repos}}, $dest; - $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; - $cmp->{repo} = $dest; - $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src}; - $orig{$cmp->{nvra}}++; - } else { - $cmp->{delete}++; } } else { $cmp->{delete}++;