--- builds_bin/update_repos	2008/01/22 20:34:23	1.37
+++ builds_bin/update_repos	2008/03/27 22:37:18	1.42
@@ -48,8 +48,8 @@ my $repos = { 'smeos'              => {
 	      'smeextras'          => { prio => 15, inc => 0, ver => 1, rel => 1 },
 	      'smeaddons'          => { prio => 14, inc => 0, ver => 1, rel => 1 },
 	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 1 },
-	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 2, devel => 2 },
-	      'smedev'             => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 },
+	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 3, devel => 2 },
+	      'smedev'             => { prio => 11, inc => 0, ver => 1, rel => 1, devel => 1 },
 	      'centos'             => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'epel'               => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'fedora-extras'      => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
@@ -95,13 +95,13 @@ if ( $opts{q} ) {
 }
 
 my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3', 'vim' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
-			 'atrpms'        => { map { $_ => 1 } ( 'dovecot', 'trac', 'yum' ) },
+			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
 			 'fedora'        => { map { $_ => 1 } ( 'kernel-xen' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'smolt' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'proftpd', 'smolt' ) },
 			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 		       },
@@ -208,6 +208,10 @@ foreach my $smever ( sort { $a <=> $b }
 				}
 			    } elsif ( $repos->{$cmp->{repo}}->{orig}) {
 				$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";
+				}
 			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
 				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
 			    } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) {
@@ -225,6 +229,10 @@ foreach my $smever ( sort { $a <=> $b }
 			    push @{$cmp->{repos}}, $dest;
 			    if ( $repos->{$cmp->{repo}}->{orig} ) {
 				$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";
+				}
 			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
 				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
 			    } else {
@@ -232,7 +240,10 @@ 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} && $repos->{$dest}->{prio} > $repos->{$track{repo}}->{prio} ) {
+				$track{repo} = $dest;
+				$track{svr} = $cmp->{svr};
+			    }
 			}
 			if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
 			    $reposrc{$cmp->{repo}}->{srpm} = $cmp;
@@ -253,19 +264,18 @@ foreach my $smever ( sort { $a <=> $b }
 			    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) ) {
+			    if ( $cmp->{src} && ! $reposrc{$dest} ) {
+				$cmp->{delete}++;
+			    } elsif ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! 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;
+				$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}++;
@@ -378,6 +388,10 @@ foreach my $smever ( sort { $a <=> $b }
 		print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n";
 		qx(rm -f $src) unless $opts{t};
 		$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";
+		}
 	    }
 	}
     }
@@ -461,7 +475,7 @@ sub process_rpm {
 	return if $repos->{$cmp->{repo}}->{base} && $repos->{$cmp->{repo}}->{prio} > $repos->{$repo}->{prio} && $pkg ge $cmp->{rpm};
     }
     my ($src, $version, $release) = ($pkg->is_source_package ? $pkg->filename : $pkg->sourcerpm) =~ m{(?:^|/)([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
-    return if $skippkg->{$smever}->{$repo} && $skippkg->{$smever}->{$repo}->{$src};
+    return if $skippkg->{$smever}->{$repo} && ( $skippkg->{$smever}->{$repo}->{$src} || $skippkg->{$smever}->{$repo}->{$pkg->name} );
     return if $repos->{$repo}->{base} && $nosig;
     if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; }
     my $arch = 'unknown';