--- builds_bin/update_repos	2007/12/11 00:04:40	1.30
+++ builds_bin/update_repos	2008/07/26 21:51:03	1.47
@@ -14,7 +14,7 @@ umask 002;
 $| = 1;
 
 my %opts;
-getopts( 'otr:', \%opts );
+getopts( 'osqtr:', \%opts );
 $opts{r} ||= '';
 
 my $rpm_flags = RPM2->vsf_nosha1header | RPM2->vsf_nomd5header | RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader;
@@ -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 },
@@ -76,10 +74,6 @@ my $baserepo = { '~Ssmeos/~A/SME/~O' =>
 		 '/mirrors/centos/~C/updates/~A/RPMS/' => 'centos',
 		 '/mirrors/centos/~C/os/~A/CentOS/~O' => 'centos',
 		 '/mirrors/centos/~C/extras/~A/RPMS/' => 'centos',
-		 '/mirrors/centos-qa/CentOS/~C/fasttrack/~A/RPMS/' => 'centos',
-		 '/mirrors/centos-qa/CentOS/~C/updates/~A/RPMS/' => 'centos',
-		 '/mirrors/centos-qa/CentOS/~C/os/~A/CentOS/~O' => 'centos',
-		 '/mirrors/centos-qa/CentOS/~C/extras/~A/RPMS/' => 'centos',
 		 '/mirrors/fedora/epel/~C/~A/' => 'epel',
 		 '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
 		 '/mirrors/fedora/extras/~F/~A/' => 'fedora-extras',
@@ -93,15 +87,22 @@ my $baserepo = { '~Ssmeos/~A/SME/~O' =>
 		 '/mirrors/fedora/core/updates/~F/~A/' => 'fedora',
 	       };
 
+if ( $opts{q} ) {
+    $baserepo->{'/mirrors/centos-qa/CentOS/~C/fasttrack/~A/RPMS/'} = 'centos';
+    $baserepo->{'/mirrors/centos-qa/CentOS/~C/updates/~A/RPMS/'} = 'centos';
+    $baserepo->{'/mirrors/centos-qa/CentOS/~C/os/~A/CentOS/~O'} = 'centos';
+    $baserepo->{'/mirrors/centos-qa/CentOS/~C/extras/~A/RPMS/'} = 'centos';
+}
+
 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-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', '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' ) },
-			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'proftpd', 'smolt' ) },
+			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 		       },
 	      };
@@ -140,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 = ();
@@ -154,27 +156,25 @@ foreach my $smever ( sort { $a <=> $b }
 	foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{rpms}} ) {
 	    next if $pkg->{done};
 
-	    if ( $rpms->{$base}->{vers}->{$pkg->{svr}} ) {
-		foreach my $tmp ( @{$rpms->{$base}->{vers}->{$pkg->{svr}}} ) {
+	    my $tmp = $pkg->{svr};
+	    SRC: {
+		$rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}                     && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.sme$}{}                && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+	    }
+	    if ( $rpms->{$base}->{vers}->{$tmp} ) {
+		foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) {
 		    $tmp->{svr} = $pkg->{svr};
-		    push @{$rpms->{$base}->{rpms}}, $tmp;
-		}
-	    } else {
-		my $tmp = $pkg->{svr};
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}	         && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)$}{$1}	         && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}	         && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}		         && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}	         && $rpms->{$base}->{vers}->{$tmp} && last;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.sme$}{}	         && $rpms->{$base}->{vers}->{$tmp} && last;
-		if ( $rpms->{$base}->{vers}->{$tmp} ) {
-		    foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) {
-			$tmp->{svr} = $pkg->{svr};
-			push @{$rpms->{$base}->{rpms}}, $tmp;
-		    }
+		    push @{$rpms->{$base}->{rpms}}, $tmp unless $tmp->{added};
+		    $tmp->{added}++;
 		}
 	    }
 
@@ -182,23 +182,23 @@ foreach my $smever ( sort { $a <=> $b }
 	    my %pkgs = ();
 	    my %reposrc = ();
 	    my $srpm = undef;
-	    foreach my $cmp ( sort { $repos->{$b->{repo}}->{prio} <=> $repos->{$a->{repo}}->{prio} || $a->{src} <=> $b->{src} } @{$rpms->{$base}->{rpms}} ) {
+	    foreach my $cmp ( sort { $a->{src} <=> $b->{src} || $repos->{$b->{repo}}->{prio} <=> $repos->{$a->{repo}}->{prio} } @{$rpms->{$base}->{rpms}} ) {
 		next unless $cmp->{svr} eq $pkg->{svr};
 
 		if ( ! $track{repo} || $repos->{$cmp->{repo}}->{prio} > $repos->{$track{repo}}->{prio} ) {
-		    $track{repo} = $cmp->{repo};
-		    $track{svr} = $cmp->{svr};
-		}
-		if ( $cmp->{svr} eq $track{svr} ) {
 		    if ( $cmp->{src} ) {
-			$srpm = $cmp unless $srpm;
-			if ( $reposrc{$cmp->{repo}} ) {
-			    $reposrc{$cmp->{repo}}->{srpm} = $cmp;
-			    $cmp->{latest}++ if $reposrc{$cmp->{repo}}->{latest};
-			} elsif ( ! $repos->{$cmp->{repo}}->{base} ) {
+			if ( ! $track{repo} ) {
 			    $cmp->{delete}++;
+			    $cmp->{done}++;
+			    next;
 			}
-		    } elsif ( $seen{$cmp->{nvra}} ) {
+		    } else {
+			$track{repo} = $cmp->{repo};
+			$track{svr} = $cmp->{svr};
+		    }
+		}
+		if ( $cmp->{svr} eq $track{svr} ) {
+		    if ( $seen{$cmp->{nvra}} ) {
 			if ( $track{repo} ne $cmp->{repo} ) {
 			    if ($repos->{$cmp->{repo}}->{stage} ) {
 				if ( $seen{$cmp->{nvra}}->{latest} ) {
@@ -208,6 +208,12 @@ 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 ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
+				}
+			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
+				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
 			    } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) {
 				$cmp->{delete}++;
 			    }
@@ -215,6 +221,7 @@ foreach my $smever ( sort { $a <=> $b }
 		    } elsif ($repos->{$cmp->{repo}}->{stage} ) {
 			$cmp->{delete}++;
 		    } else {
+			$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);
@@ -222,28 +229,65 @@ 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 ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
+				}
+			    } 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} && $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;
 			}
 		    }
 		} else {
 		    if ( $track{repo} eq $cmp->{repo} ) {
 			if ( verrel($cmp, $cmp->{repo}, \%counts) ) {
 			    $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base};
+			} elsif ( $cmp->{src} ) {
+			    $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base};
 			} else {
 			    $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) ) {
+				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}}++;
+			    } else {
+				$cmp->{delete}++;
+			    }
+			} else {
+			    $cmp->{delete}++;
+			}
 		    }
 		}
-		$reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{delete} || $repos->{$cmp->{repo}}->{base};
 		unless ( $repos->{$cmp->{repo}}->{orig} || ( $cmp->{delete} && ! $cmp->{repos} ) ) {
 		    $pkgs{$cmp->{nvra}}++;
 		    $latest{$cmp->{base}} = $cmp->{svr} if $repos->{$cmp->{repo}}->{inc} && ! $latest{$cmp->{base}};
+		    $reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{src} || $repos->{$cmp->{repo}}->{stage};
 		    unless ( $seen{$cmp->{nvra}} ) {
 			$seen{$cmp->{nvra}} = $cmp;
 			$cmp->{latest}++ if $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc};
@@ -253,21 +297,18 @@ foreach my $smever ( sort { $a <=> $b }
 		$cmp->{done}++;
 	    }
 	    if ( $srpm ) {
-		foreach my $r ( keys %reposrc ) {
-		    next if $repos->{$r}->{orig};
+		foreach my $r ( sort { $repos->{$b}->{prio} <=> $repos->{$a}->{prio} } keys %reposrc ) {
 		    unless ( $reposrc{$r}->{srpm} ) {
-			push @{$srpm->{repos}}, $r;
-			$pkgs{$srpm->{nvra}}++;
-			$orig{$srpm->{nvra}}++ if $repos->{$srpm->{repo}}->{orig};
+			unshift @{$srpm->{repos}}, $r;
 			$srpm->{oldrepo} = $srpm->{repo} unless $srpm->{oldrepo};
 			$srpm->{repo} = $r;
 			$reposrc{$r}->{srpm} = $srpm;
 		    }
 		}
-	    } elsif ( scalar keys %pkgs ) {
-		print "\n * missing source (", $pkg->{svr}, ")\n";
+	    } elsif ( scalar keys %pkgs && $opts{s} ) {
+		print "\n * missing source (sme$smever, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n";
 	    }
-	    print "\n * missing originals (", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
+	    print "\n * missing originals (sme$smever, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
 	}
 
 	foreach my $r ( keys %$acnt ) {
@@ -343,9 +384,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";
-		qx(rm -f $src);
+		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 ! $opts{t} && -d $tag && -f "$tag/PUSHED";
+		}
 	    }
 	}
     }
@@ -362,9 +407,9 @@ foreach my $smever ( sort { $a <=> $b }
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
 		if ( -f "$dir/repodata/comps.xml" ) {
-		    qx(createrepo -g $dir/repodata/comps.xml $dir);
+		    qx(createrepo --update --database --groupfile repodata/comps.xml $dir);
 		} else {
-		    qx(createrepo $dir);
+		    qx(createrepo --update --database $dir);
 		}
 		qx(repoview $dir);
 		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";
@@ -373,7 +418,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');
     }
 }
 
@@ -382,6 +427,7 @@ sub verrel {
     my $repo = shift;
     my $counts = shift;
 
+    return 0 if $pkg->{src};
     $counts->{$repo}->{$pkg->{ver}}->{$pkg->{rel}}++;
     return 1 if $repos->{$repo}->{ver} && scalar keys %{$counts->{$repo}} > $repos->{$repo}->{ver};
     return 1 if $repos->{$repo}->{rel} && scalar keys %{$counts->{$repo}->{$pkg->{ver}}} > $repos->{$repo}->{rel};
@@ -395,7 +441,8 @@ sub pkgdest {
     my $pkgs = shift;
 
     foreach my $cmp ( @$pkgs ) {
-	next if $cmp->{src} || $cmp->{name} ne $pkg->{name} || $repos->{$cmp->{repo}}->{prio} <= $repos->{$dest}->{prio};
+	next if $cmp->{src} || $repos->{$cmp->{repo}}->{prio} <= $repos->{$dest}->{prio};
+	next if $pkg->{name} ne ( $pkg->{src} ? $cmp->{base} : $cmp->{name} );
 	if ( $repos->{$cmp->{repo}}->{prio} > $repos->{$hirepo}->{prio} ) {
 	    $dest = $hirepo;
 	    last;
@@ -427,9 +474,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,
@@ -437,6 +489,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,