--- builds_bin/update_repos	2007/12/11 15:35:32	1.33
+++ builds_bin/update_repos	2008/03/28 03:33:43	1.43
@@ -29,7 +29,6 @@ my $distrepo = { '7' => { active   => 1,
 			  os       => 'RPMS/',
 			  builds   => '/builds/smeserver-7-core/',
 			  contribs => '/builds/smeserver-7-contribs/',
-			  qa       => '/builds/smeserver-7-qa/',
 			  stage    => '/stage/7/',
 			},
 		 '8' => { active   => 1,
@@ -39,7 +38,6 @@ my $distrepo = { '7' => { active   => 1,
 			  os       => '',
 			  builds   => '/builds/smeserver-8-core/',
 			  contribs => '/builds/smeserver-8-contribs/',
-			  qa       => '/builds/smeserver-8-qa/',
 			  stage    => '/stage/8/',
 			},
 	       };
@@ -49,9 +47,9 @@ my $repos = { 'smeos'              => {
 	      'smeupdates-testing' => { prio => 16, inc => 1, ver => 1, rel => 1 },
 	      '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 => 2 },
-	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 2, devel => 2 },
-	      'smedev'             => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 },
+	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 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 },
@@ -97,13 +95,13 @@ if ( $opts{q} ) {
 }
 
 my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3', 'vim' ) },
-			 'epel'          => { map { $_ => 1 } ( 'perl-Razor-Agent' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', '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 } ( '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' ) },
 		       },
@@ -143,10 +141,11 @@ foreach my $smever ( sort { $a <=> $b }
 	    last unless $dir =~ m{~A};
 	}
     }
-    find( { wanted => sub { process_rpm($_, $smever, 'builds'); }, no_chdir => 1, follow_fast => 1 }, ( $distrepo->{$smever}->{'builds'}, $distrepo->{$smever}->{'qa'} ) );
+    find( { wanted => sub { process_rpm($_, $smever, 'builds'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{'builds'} );
     find( { wanted => sub { process_rpm($_, $smever, 'contribs'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{'contribs'} );
 
     foreach my $base ( sort keys %$rpms ) {
+	next unless $rpms->{$base}->{rpms};
 	my %track = ();
 	my %seen = ();
 	my %counts = ();
@@ -209,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} ) {
@@ -226,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 {
@@ -233,6 +240,10 @@ foreach my $smever ( sort { $a <=> $b }
 			    }
 			    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
 			    $cmp->{repo} = $dest;
+			    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;
@@ -248,7 +259,30 @@ 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);
+			    if ( $cmp->{src} && ! $reposrc{$dest} ) {
+				$cmp->{delete}++;
+			    } elsif ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
+				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}++;
+			    }
+			} else {
+			    $cmp->{delete}++;
+			}
 		    }
 		}
 		unless ( $repos->{$cmp->{repo}}->{orig} || ( $cmp->{delete} && ! $cmp->{repos} ) ) {
@@ -351,9 +385,13 @@ foreach my $smever ( sort { $a <=> $b }
 		}
 		qx(rm -f $src) if exists $pkg->{delete} && ! $opts{t};
 	    } elsif ( $pkg->{delete} ) {
-		print "delete from ", $pkg->{repo}, " (", basename($pkg->{rpm}->filename), ")\n";
+		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";
+		}
 	    }
 	}
     }
@@ -381,7 +419,7 @@ foreach my $smever ( sort { $a <=> $b }
 	}
     }
     unless ( $opts{t} ) {
-	finddepth(sub{rmdir}, $distrepo->{$smever}->{$_}) foreach ('builds','contribs','qa');
+	finddepth(sub{rmdir}, $distrepo->{$smever}->{$_}) foreach ('builds','contribs');
     }
 }
 
@@ -437,9 +475,14 @@ 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';
+    $arch = 'SRPMS' if $pkg->filename =~ m{[/-](SRPMS?|src|source)/};
+    $arch = 'x86_64' if $pkg->filename =~ m{[/-]x86_64/};
+    $arch = 'i386' if $pkg->filename =~ m{[/-](i[356]86)/};
+    $arch = 'noarch' if $pkg->filename =~ m{[/-]noarch/};
 
     my $rpmhash = { base  => $src,
 		    name  => $pkg->name,
@@ -447,6 +490,7 @@ sub process_rpm {
 		    nvra  => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
 		    svr   => $src.'-'.$version.'-'.$release,
 		    src   => $pkg->is_source_package,
+		    arch  => $arch,
 		    ver   => $version,
 		    rel   => $release,
 		    rpm   => $pkg,