--- builds_bin/update_repos 2008/03/28 03:33:43 1.43 +++ builds_bin/update_repos 2008/06/26 20:48:23 1.45 @@ -210,7 +210,7 @@ foreach my $smever ( sort { $a <=> $b } $orig{$cmp->{nvra}}++; unless ( $repos->{$cmp->{repo}}->{base} ) { my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel}; - qx(touch $tag/PUSHED) if -d $tag && ! -f "$tag/PUSHED"; + qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; } } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { $reposrc{$cmp->{repo}}->{srpm} = $cmp; @@ -231,7 +231,7 @@ foreach my $smever ( sort { $a <=> $b } $orig{$cmp->{nvra}}++; unless ( $repos->{$cmp->{repo}}->{base} ) { my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel}; - qx(touch $tag/PUSHED) if -d $tag && ! -f "$tag/PUSHED"; + qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; } } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { $reposrc{$cmp->{repo}}->{srpm} = $cmp; @@ -267,16 +267,15 @@ foreach my $smever ( sort { $a <=> $b } 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->{$smever}->{$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}}++; - unless ( $repos->{$cmp->{repo}}->{base} ) { - my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel}; - qx(touch $tag/PUSHED) if -d $tag && ! -f "$tag/PUSHED"; - } } else { $cmp->{delete}++; } @@ -390,7 +389,7 @@ foreach my $smever ( sort { $a <=> $b } $repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage}; if ( $repos->{$pkg->{repo}}->{orig} && ! $repos->{$pkg->{repo}}->{base} ) { my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$pkg->{repo}}, $pkg->{name}, $pkg->{ver}, $pkg->{rel}; - qx(rm -f $tag/PUSHED) if -d $tag && -f "$tag/PUSHED"; + qx(rm -f $tag/PUSHED) if ! $opts{t} && -d $tag && -f "$tag/PUSHED"; } } }