--- builds_bin/update_repos	2007/10/16 21:36:23	1.19
+++ builds_bin/update_repos	2007/11/03 19:06:19	1.20
@@ -3,253 +3,478 @@
 use strict;
 use warnings;
 use RPM2;
+use File::Find;
+use File::Basename;
+use Getopt::Std;
+use Term::ANSIColor;
 use Data::Dumper;
 
-sub compare($$);
+delete $ENV{PATH};
+my $HOME=$ENV{HOME};
+umask 002;
+
+my $rpm_flags = RPM2->vsf_nosha1header | RPM2->vsf_nomd5header | RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader;
+$rpm_flags |= RPM2->vsf_nosha1 | RPM2->vsf_nomd5 | RPM2->vsf_nodsa | RPM2->vsf_norsa;
+
+$Term::ANSIColor::AUTORESET = 1;
+$| = 1;
+
+my @archs = ( 'i386', 'x86_64' );
+
+my $repos = { 'smeos'              => { prio => 16, inc => 1, ver => 1, rel => 1, os => 1 },
+	      'smeupdates'         => { prio => 15, inc => 1, ver => 1, rel => 1 },
+	      'smeupdates-testing' => { prio => 14, inc => 1, ver => 1, rel => 1 },
+	      'smeextras'          => { prio => 13, inc => 0, ver => 1, rel => 1 },
+	      'smeaddons'          => { prio => 12, inc => 0, ver => 1, rel => 1 },
+	      'smecontribs'        => { prio => 11, inc => 0, ver => 1, rel => 1 },
+	      'smetest'            => { prio => 10, inc => 1, ver => 2, rel => 2, devel => 2 },
+	      'smedev'             => { prio =>  9, inc => 0, ver => 2, rel => 2, devel => 1 },
+	      'centos'             => { prio =>  8, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'fedora/epel'        => { prio =>  7, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'fedora/extras'      => { prio =>  6, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'rpmforge'           => { prio =>  5, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'atrpms'             => { prio =>  4, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'fedora/core'        => { prio =>  3, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'base'               => { prio =>  2, inc => 0, ver => 0, rel => 0, base => 1 },
+	      'builds'             => { prio =>  1, inc => 0, ver => 0, rel => 0, builds => 1 },
+	    };
+
+my $distrepo = { '7' => { active => 1,
+			  centos => 4,
+			  fedora => 3,
+			  repo   => '/releases/7/',
+			  os     => 'SME/RPMS/',
+			  builds => '/builds2/smeserver-7-core/',
+			},
+		 '8' => { active => 1,
+			  centos => 5,
+			  fedora => 6,
+			  repo   => '/releases/testing/8/',
+			  os     => 'SME/',
+			  builds => '/builds2/smeserver-8-core/',
+			},
+	       };
+
+my @baserepo = ( ( map { "/mirrors/centos/~C/$_/" } ('os','updates','fasttrack','extras') ),
+		 ( map { "/mirrors/fedora/epel$_/~C/" } ('','/testing') ),
+		 '/mirrors/fedora/extras/~F/',
+		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/RPMS.dag/',
+		 '/mirrors/rpmforge/dag/source/',
+		 ( map { "/mirrors/atrpms$_/el~C-~A/atrpms/stable/" } ('','/src') ),
+		 ( map { "/mirrors/atrpms$_/el~C-~A/atrpms/testing/" } ('','/src') ),
+		 ( map {"/mirrors/fedora/core$_/~F/" } ('','/updates') ),
+	       );
+
+my $skippkg = { '7' => { 'centos'           => ['horde','imp-h3','ingo-h3','turba-h3','vim'],
+			 'fedora/epel'      => ['perl-Razor-Agent'],
+			 'rpmforge'         => ['perl-Test-Inline'],
+			 'atrpms'           => ['dovecot','yum'],
+		       },
+		'8' => { 'centos'           => ['horde','imp-h3','ingo-h3','turba-h3'],
+			 'fedora/epel'      => ['perl-Razor-Agent','smolt'],
+			 'fedora/extras'    => ['dstat','gocr','horde','oidentd','perl-Test-Inline','perl-Razor-Agent','smolt'],
+			 'rpmforge'         => ['perl-Test-Inline'],
+			 'atrpms'           => [],
+			 'fedora/core'      => [],
+		       },
+	      };
+
+my %opts;
+getopts( 'dtvr:', \%opts );
+$opts{r} ||= '';
+
+my ($devel1, $devel2) = sort { $repos->{$a}->{devel} <=> $repos->{$b}->{devel} } grep { $repos->{$_}->{devel} } keys %$repos;
+$devel2 ||= $devel1;
+
+my ($rel, @rpms, %pkgnames, %sources, $archs, $rebuild, $newline);
+foreach my $smever ( sort { $a <=> $b } grep { $distrepo->{$_}->{active} } keys %$distrepo ) {
+    $rel = $smever;
+    %pkgnames = ();
+    %sources = ();
+    @rpms = ();
+    $rebuild = ();
+
+    # Load distro packages
+    find( { wanted => \&loadpkg, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{repo}, $distrepo->{$smever}->{builds} );
+    printline('white', 0, "Distro (SME Server $rel) packages loaded.\n");
+
+    # Load base packages
+    foreach my $base ( @baserepo ) {
+	my $bdir = $base;
+	$bdir =~ s/~C/$distrepo->{$smever}->{centos}/;
+	$bdir =~ s/~F/$distrepo->{$smever}->{fedora}/;
+	if ( $bdir =~ m{~A} ) {
+	    for my $arch ( @archs ) {
+		my $basearch = $bdir;
+		$basearch =~ s/~A/$arch/;
+		find( { wanted => \&loadbase, no_chdir => 1, follow_fast => 1 }, $basearch ) if -r $basearch;
+	    }
+	} else {
+	    find( { wanted => \&loadbase, no_chdir => 1, follow_fast => 1 }, $bdir ) if -r $bdir;
+	}
+    }
+    printline('white', 0, 'Base (Centos: ', $distrepo->{$smever}->{centos}, ', Fedora: ', $distrepo->{$smever}->{fedora}, ") packages loaded.\n");
+
+    foreach my $name ( sort keys %{{ map { $_->{base} => 1 } @rpms }} ) {
+	printline('white', 0, "Processing: $name");
+	my @pkgs = sort pkgsrt grep { $_->{base} eq $name } @rpms;
+	my %seen = ();
+	my $count = ();
+	$archs = ();
+
+	foreach my $pkg ( @pkgs ) {
+	    next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}};
+	    printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d};
+	    my $orig = 0;
+
+	    # Find names of packages in same or higher repos
+	    my %names = names($pkg, @pkgs);
+
+	    # Move packages from base/builds to correct area
+	    if ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {
+		printline('dark blue', 1, '    - checking base/builds') if $opts{d};
+		my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
+		if ( $pkg->{nonbase} ) {
+		    foreach my $up ( grep { $_->{name} eq $pkg->{name} && $_->{rpm} lt $pkg->{rpm} && $_->{obsolete} } @rpms ) {
+			next if rprop($up, 'builds') || rprop($up, 'base');
+			$repo = $up->{repo};
+			last;
+		    }
+		} 
+		next if rprop($pkg, 'base') && $repo eq $devel1 && $devel1 ne $devel2;
+		movepkg($pkg, $repo);
+		%names = names($pkg, @pkgs);
+		$seen{$pkg->{nvra}}++;
+		$orig++;
+	    }
+
+	    # Check version/release counts
+	    unless ( $pkg->{nonbase} ) {
+		printline('dark blue', 1, '    - checking version/release counts') if $opts{d};
+		$count->{$pkg->{repo}}->{$pkg->{version}}->{$pkg->{release}}++;
+		if ( rprop($pkg, 'ver') && scalar keys %{$count->{$pkg->{repo}}} > rprop($pkg, 'ver') ) {
+		    movepkg($_, 'delete') foreach grep { $_->{rpm} eq $pkg->{rpm} } @pkgs;
+		    next;
+		}
+		if ( rprop($pkg, 'rel') && scalar keys %{$count->{$pkg->{repo}}->{$pkg->{version}}} > rprop($pkg, 'rel') ) {
+		    movepkg($_, 'delete') foreach grep { $_->{rpm} eq $pkg->{rpm} } @pkgs;
+		    next;
+		}
+	    }
 
-my $releases = 2;
+	    foreach my $cmp ( grep { $_->{rpm}->is_source_package || ( ! $_->{done} && $_->{rpm} le $pkg->{rpm} && rprop($_, 'prio') <= rprop($pkg, 'prio') ) } @pkgs ) {
+		printline('dark blue', 1, '    - ', $cmp->{rpm}->filename) if $opts{d};
+		if ( $cmp->{rpm}->is_source_package ) {
+		    if ( $cmp->{name} eq $pkg->{base} ) {
+			if ( $cmp->{rpm} eq $pkg->{rpm} ) {
+			    $pkg->{srpm} = $cmp if ! $pkg->{srpm} || $pkg->{srpm}->{rpm} ne $pkg->{rpm} || $pkg->{srpm}->{repo} ne $pkg->{repo};
+			    tagpkg($cmp, 'inuse', 0) if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
+			}
+			next if $pkg->{srpm} && $pkg->{srpm}->{rpm} eq $pkg->{rpm};
 
-my $releasedir = '/releases';
-my $smerel = '7';
-my $centosrel = '4';
-my $fedorarel = '3';
-my $builds = '/builds/rpms';
-my $stagedir = '/builds';
-my $arch = `uname -i`;
-chomp $arch;
-#$arch = 'x86_64';
-
-my @repos = (
-              "$releasedir/$smerel/smeos/$arch/SME",
-              "$releasedir/$smerel/smeos/$arch/SME/RPMS",
-              "$releasedir/$smerel/smeos/$arch/CentOS/RPMS",
-              "$releasedir/$smerel/smeupdates/$arch/RPMS",
-              "$releasedir/$smerel/smeupdates-testing/$arch/RPMS",
-              "$releasedir/$smerel/smeextras/$arch/RPMS",
-              "$releasedir/$smerel/smeaddons/$arch/RPMS",
-              "$releasedir/$smerel/smecontribs/$arch/RPMS",
-              "$releasedir/$smerel/smetest/$arch/RPMS",
-              "$releasedir/$smerel/smedev/$arch/RPMS",
-              "$builds/RPMS/$arch",
-              "$builds/RPMS/i586",
-              "$builds/RPMS/i686",
-              "$builds/RPMS/noarch",
-              "$stagedir/RPMS-$arch",
-            );
-@repos = grep { ! m{/i[56]86$} } @repos if $arch eq 'x86_64';
-
-my @srcrepos = (
-                 "/mirrors/centos/$centosrel/fasttrack/SRPMS",
-                 "/mirrors/centos/$centosrel/updates/SRPMS",
-                 "/mirrors/centos/$centosrel/os/SRPMS",
-                 "/mirrors/centos/$centosrel/extras/SRPMS",
-                 "/mirrors/rpmforge/dag/source",
-                 "/mirrors/atrpms/src/el$centosrel-$arch/atrpms/stable",
-                 "/mirrors/atrpms/src/el$centosrel-$arch/atrpms/testing",
-                 "/mirrors/fedora/epel/$centosrel/SRPMS",
-                 "/mirrors/fedora/epel/testing/$centosrel/SRPMS",
-                 "/mirrors/fedora/core/updates/$fedorarel/SRPMS",
-                 "/mirrors/fedora/core/$fedorarel/source/SRPMS",
-                 "/mirrors/fedora/extras/$fedorarel/SRPMS",
-                 "$builds/SRPMS",
-              );
-
-my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_nodsa;
-
-my @rpms;
-my %srpms;
-my %sources;
-my %changed;
-my %copy;
-
-print "\nReading repos...\n";
-foreach my $repo ( @repos ) {
-	my $r = $repo;
-	if ( $repo =~ m{$stagedir/RPMS} ) {
-		$r = $stagedir;
-	} elsif ( $repo =~ m{$builds/RPMS} ) {
-		$r = 'builds';
-	} elsif ( $repo =~ m{^($releasedir/$smerel/sme[^/]*)/} ) {
-		$r = $1;
-	}
-
-	if ( $r eq $stagedir ) {
-		opendir SRPMS, "$r/SRPMS-$arch" or next;
-		foreach my $srpm ( grep { /\.rpm$/ } readdir SRPMS ) {
-			$srpms{$r}{$srpm} = 0;
-			$sources{$srpm} = "$r/SRPMS-$arch";
-		}
-		closedir SRPMS;
-	} elsif ( $r ne 'builds' ) {
-		opendir SRPMS, "$r/SRPMS" or next;
-		foreach my $srpm ( grep { /\.rpm$/ } readdir SRPMS ) {
-			$srpms{$r}{$srpm} = 0;
-			$sources{$srpm} = "$r/SRPMS";
-		}
-		closedir SRPMS;
-	}
-
-	opendir RPMS, $repo or next;
-	print " - $repo\n";
-	foreach my $pkg ( reverse sort map { RPM2->open_package("$repo/$_", $rpm_flags); } grep { /\.rpm$/ } readdir RPMS ) {
-		my $rpm = { name => $pkg->tag("NAME"),
-				filename => join("-", map { $pkg->tag($_) } qw/name version release/) . "." . $pkg->tag("ARCH"),
-				version => $pkg->tag("VERSION"),
-				release => $pkg->tag("RELEASE"),
-				repo => $r,
-				rpm => $pkg,
-			      };
-		my $source = $pkg->tag("SOURCERPM");
-		$source =~ s#-$rpm->{version}-$rpm->{release}.*##;
-		$rpm->{source} = $source;
-
-		if ( $rpm->{repo} =~ m{^$releasedir/$smerel/} && $rpm->{repo} !~ m{/smedev$} ) {
-			$rpm->{repo} = 'deleted' if grep { $_->{repo} ne $rpm->{repo} && $_->{name} eq $rpm->{name} && $_->{rpm} ge $rpm->{rpm} } @rpms;
-			$rpm->{repo} = 'deleted' if grep { $_->{repo} eq $rpm->{repo} && $_->{name} eq $rpm->{name} && $_->{rpm} gt $rpm->{rpm} } @rpms;
-			$changed{$r}++ if $rpm->{repo} eq 'deleted';
-		}
-
-		push @rpms, $rpm;
-	}
-	closedir RPMS;
-}
-
-print "\nReading source repos...\n";
-foreach my $repo ( reverse @srcrepos ) {
-        my %temp_repo = map { $_ => $repo } grep { /\.rpm$/ } readdir SRPMS if ( opendir SRPMS, $repo );
-        closedir SRPMS;
-
-        %sources = (%sources, %temp_repo);
-}
-
-print "\nFinding latest packages...\n";
-my @latest;
-foreach my $rpm ( reverse grep { $_->{repo} =~ m{^$releasedir/$smerel/} && $_->{repo} !~ m{/sme(addons|contribs|dev|extras)$} } @rpms )  {
-	unless ( grep { $_->{name} eq $rpm->{name} && $_->{rpm} gt $rpm->{rpm} } @latest ) {
-		push @latest, $rpm;
-		unless ( grep { $_->{repo} eq $stagedir && $_->{filename} eq $rpm->{filename} } @rpms ) {
-			push @{$copy{"$stagedir/RPMS-$arch"}}, $rpm->{rpm}->filename;
-			push @rpms, { name => $rpm->{name},
-				      filename => $rpm->{filename},
-				      version => $rpm->{version},
-				      release => $rpm->{release},
-				      repo => $stagedir,
-				      rpm => $rpm->{rpm},
-				      source => $rpm->{source}
-				    };
-		}
-	}
-}
-
-foreach my $rpm ( grep { $_->{repo} eq $stagedir } @rpms )  {
-	$rpm->{repo} = 'deleted' unless grep { $_->{filename} eq $rpm->{filename} } @latest;
-}
-
-foreach my $rpm ( reverse grep { $_->{repo} =~ m{^$releasedir/$smerel/} && $_->{repo} =~ m{/sme(addons|contribs|extras)$} } @rpms )  {
-	unless ( grep { $_->{name} eq $rpm->{name} && $_->{rpm} gt $rpm->{rpm} } @latest ) {
-		push @latest, $rpm;
-	}
-}
-
-print "\nFinding development packages...\n";
-my @devel;
-my %versions;
-foreach my $rpm ( grep { $_->{repo} eq 'builds' } @rpms )  {
-	next if grep { $_->{name} eq $rpm->{name} && $_->{rpm} ge $rpm->{rpm} } @latest;
-
-	$versions{$rpm->{name}}{$rpm->{version}}++ unless grep { $_->{name} eq $rpm->{name} && $_->{rpm} eq $rpm->{rpm} } @devel;
-	next if $versions{$rpm->{name}}{$rpm->{version}} > $releases || scalar keys %{$versions{$rpm->{name}}} > $releases;
-	print "Possible update " . $rpm->{rpm}->filename . "\n" if grep { $_->{name} eq $rpm->{name} } @latest;
-
-	push @devel, $rpm;
-	unless ( grep { $_->{repo} =~ m{/smedev$} && $_->{filename} eq $rpm->{filename} } @rpms ) {
-		push @{$copy{"$releasedir/$smerel/smedev/$arch/RPMS"}}, $rpm->{rpm}->filename;
-		$changed{"$releasedir/$smerel/smedev"}++;
-		push @rpms, { name => $rpm->{name},
-			      filename => $rpm->{filename},
-			      version => $rpm->{version},
-			      release => $rpm->{release},
-			      repo => "$releasedir/$smerel/smedev",
-			      rpm => $rpm->{rpm},
-			      source => $rpm->{source}
-			    };
-	}
-}
-
-foreach my $rpm ( grep { $_->{repo} =~ m{/smedev$} } @rpms )  {
-	$rpm->{repo} = 'deleted' unless grep { $_->{filename} eq $rpm->{filename} } @devel;
-}
-
-print "\nFinding source packages...\n";
-foreach my $rpm ( grep { $_->{repo} !~ m{^(builds|deleted)$} } @rpms ) {
-	my $src;
-	my $srpm = $rpm->{rpm}->tag("SOURCERPM");
-
-	my @sources = ();
-	push @sources, ($src = $srpm);
-	push @sources, $src if (($src = $srpm) =~ s/\.el\d\.rf\./\.rf\./);
-	push @sources, $src if (($src = $srpm) =~ s/\.[0-3]\.el\d+\.rf\./\.rf\./);
-	push @sources, $src if (($src = $srpm) =~ s/\.(el|fc)\d\.at//);
-	push @sources, $src if (($src = $srpm) =~ s/\.at//);
-	push @sources, $src if (($src = $srpm) =~ s/\.(el|fc)\d//);
-	push @sources, $src if (($src = $srpm) =~ s/\.\d+\.(el|fc)\d//);
-
-	my $found = 0;
-	my $repo = $rpm->{repo};
-	foreach my $source ( @sources ) {
-		if ( $sources{$source} ) {
-			if ($repo eq $stagedir) {
-				push @{$copy{"$repo/SRPMS-$arch"}}, "$sources{$source}/$source" unless -f "$repo/SRPMS-$arch/$source";
+			my $src = $pkg->{rpm}->sourcerpm;
+			my $source = basename $cmp->{rpm}->filename;
+			SRC: {
+			    $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d\.at(\.src)}{$1}                 && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d(\.rf\.src)}{$1}                 && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{(\d+)\.\d+\.el\d(\.rf\.src)}{$1$2}     && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d\.rf(\.src)}{.dag$1}             && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{(\d+)\.\d+\.el\d\.rf(\.src)}{$1.dag$2} && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d(\.src)}{$1}                     && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{(-\d+)\.\d+\.el\d(\.src)}{$1$2}        && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.centos\d(\.src)}{$1}                 && $src eq $source && last SRC;
+			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d\.sme(\.src)}{$1}                && $src eq $source && last SRC;
+			    $src = '';
+			}
+			if ( $src eq $source && ( ! $pkg->{srpm} || $pkg->{srpm}->{rpm} eq $cmp->{rpm} ) ) {
+			    $pkg->{srpm} = $cmp if ! $pkg->{srpm} || ( $pkg->{srpm}->{rpm} eq $pkg->{rpm} && $pkg->{srpm}->{repo} ne $pkg->{repo} );
+			    tagpkg($cmp, 'inuse', 0) if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
+			}
+		    }
+		} elsif ( $cmp->{rpm} eq $pkg->{rpm} ) {
+		    if ( $names{$cmp->{name}} ) {
+			if ( $pkg->{repo} eq $cmp->{repo} ) {
+			    tagpkg($cmp, 'correct', 1);
+			    $seen{$cmp->{nvra}}++;
+			} elsif ( $seen{$cmp->{nvra}} ) {
+			    $orig++ if rprop($cmp, 'base') || rprop($cmp, 'builds');
+			    movepkg($cmp, 'delete', 1);
 			} else {
-				unless ( -f "$repo/SRPMS/$source" ) {
-					push @{$copy{"$repo/SRPMS"}}, "$sources{$source}/$source";
-					$changed{$repo}++;
-				}
+			    movepkg($cmp, $pkg->{repo}, 1, 1);
+			    $seen{$cmp->{nvra}}++;
 			}
-			$srpms{$repo}{$source}++;
-			$found++;
-			last;
+		    } else {
+			tagpkg($cmp, 'nonbase', 0);
+		    }
+		} elsif ( rprop($cmp, 'prio') < rprop($pkg, 'prio') ) {
+		    tagpkg($cmp, 'obsolete', 0);
+		}
+	    }
+	    printline('dark blue', 1, '    - checking source packages') if $opts{d};
+	    if ( ! $pkg->{srpm} ) {
+		printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (missing source ', $pkg->{rpm}->sourcerpm, ')');
+	    } elsif ( $pkg->{srpm}->{repo} ne $pkg->{repo} ) {
+		movepkg($pkg->{srpm}, $pkg->{repo}, 0);
+	    }
+	    unless ( $orig ) {
+		foreach ( grep { $_->{base} eq $pkg->{base} && $_->{repo} eq $pkg->{repo} } @pkgs ) {
+		    printline('bold yellow on_red', 1, ' - ', $_->{rpm}->filename, ' (missing original)'); 
 		}
+	    }
 	}
-	print "Can't find source for ".$rpm->{rpm}->filename."\n" unless $found;
-}
+	printline('bold black', 1, ' - obsolete packages') if $opts{d};
+	movepkg($_, 'delete') foreach grep { ! rprop($_, 'base') && ! $_->{done} && ( $_->{obsolete} || ( $_->{rpm}->is_source_package && ! $_->{inuse} ) ) } @pkgs;
 
-my @remove;
-foreach my $repo ( keys %srpms ) {
-	foreach my $rpm ( keys %{$srpms{$repo}} ) {
-		unless ( $srpms{$repo}{$rpm} ) {
-			if ($repo eq $stagedir) {
-				push @remove, "$repo/SRPMS-$arch/$rpm";
-			} else {
-				push @remove, "$repo/SRPMS/$rpm";
-				$changed{$repo}++;
-			}
+	printline('bold black', 1, ' - arch count check') if $opts{d};
+	foreach my $r ( keys %$archs ) {
+	    foreach my $p ( keys %{$archs->{$r}} ) {
+		foreach my $a ( keys %{$archs->{$r}->{$p}} ) {
+		    my $p2 = ${$archs->{$r}->{$p}->{$a}}[0];
+		    if ( $a eq 'noarch' ) {
+			movepkg($p2, $p2->{repo}, 0) if ! $p2->{repos} && scalar @{$archs->{$r}->{$p}->{$a}} != scalar @archs;
+		    } elsif ( scalar @{$archs->{$r}->{$p}->{$a}} != 1 ) {
+			printline('bold yellow on_red', 1, ' - ', $p2->{rpm}->filename, ' (many arch)');
+		    }
+		}
+	    }
+	}
+    }
+    printline('white', 0, "Finished processing.\n");
+
+    unless ( $opts{t} || $opts{r} ) {
+	my %repochg = ();
+	# Move / Copy / Delete packages and tag repo for rebuild.
+	foreach my $pkg ( grep { $_->{oldrepo} } @rpms ) {
+	    printline('white', 0, 'Copy/move: ', $pkg->{rpm}->filename);
+	    my $src = $pkg->{rpm}->filename;
+
+	    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null) if $pkg->{nosig};
+	    if ( $pkg->{repos} ) {
+		foreach my $dest ( dest($pkg, @{$pkg->{repos}}) ) {
+		    qx(cp --preserve=timestamps $src $dest) unless -f $dest;
 		}
+		$repochg{$_}++ foreach @{$pkg->{repos}};
+	    }
+	    if ( $pkg->{remove} ) {
+		qx(rm -f $src);
+		$repochg{$pkg->{oldrepo}}++;
+	    }
+	}
+	finddepth(sub{rmdir}, $distrepo->{$rel}->{builds});
+	printline('white', 0, "Finished copying/moving.\n");
+
+	foreach my $repo ( sort keys %repochg ) {
+	    next if ! $repos->{$repo} || $repos->{$repo}->{base} || $repos->{$repo}->{builds};
+	    foreach my $arch ( @archs ) {
+		my $dir = $distrepo->{$rel}->{repo} . "$repo/$arch";
+		$dir = qx(readlink -f $dir);
+		chomp $dir;
+		printline('white', 0, "Createrepo: $repo/$arch");
+		qx(createrepo $dir);
+		printline('white', 0, "Repoview: $repo/$arch");
+		qx(repoview $dir);
+		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";
+		qx(rm -rf $dir/.repodata) if -d "$dir/.repodata";
+	    }
 	}
+	printline('white', 0, "Finished rebuilding repos.\n");
+    }
+
+    print "\n================================================================================\n\n";
 }
 
-print "\n";
-foreach my $repo ( sort keys %copy ) {
-        foreach my $rpm ( keys %{{ map { $_ => 1 } @{$copy{$repo}} }} ) {
-                print "copying $rpm to $repo/\n";
-		mkdir "$repo" unless -d "$repo";
-                system(qw(cp --preserve=timestamps), $rpm, "$repo/");
-        }
-}
-
-print "\n";
-foreach my $rpm ( keys %{{ map { $_ => 1 } (@remove, map { $_->{rpm}->filename } grep { $_->{repo} eq 'deleted' } @rpms) }} ) {
-        print "removing $rpm\n";
-        unlink $rpm;
-}
-
-print "\n";
-foreach my $repo ( sort keys %changed ) {
-	my $dir=`readlink -f $repo/$arch`;
-	chomp $dir;
-        print "rebuilding $dir...\n";
-        system(qw(createrepo), "$dir");
-        system(qw(rm -rf), "$dir/.olddata") if -d "$dir/.olddata";
-        system(qw(repoview), "$dir");
-        system(qw(rm -rf), "$dir/.repodata") if "$dir/.repodata";
+sub pkgsrt {
+    return $b->{rpm} cmp $a->{rpm} || rprop($b, 'prio') <=> rprop($a, 'prio') || $a->{arch} cmp $b->{arch} || $a->{name} cmp $b->{name};
 }
+
+sub rprop {
+    my ($pkg, $prop) = @_;
+    return $repos->{$pkg->{repo}} ? $repos->{$pkg->{repo}}->{$prop} : 0;
+}
+
+sub names {
+    my $pkg = shift;
+    my @rpms = @_;
+    return map { $_->{name} => rprop($_, 'inc') ? 2 : 1 } grep { $_->{base} eq $pkg->{base} && 
+								 rprop($_, 'prio') >= rprop($pkg, 'prio') && 
+								 ! rprop($_, 'base') &&
+								 ! rprop($_, 'builds') &&
+								 ! $_->{rpm}->is_source_package
+							       } @rpms;
+}
+
+sub dest {
+    my ($pkg, @repos) = @_;
+    my @d = ();
+    foreach my $repo ( @repos ) {
+	if ( $pkg->{arch} eq 'noarch' ) {
+	    push @d, $distrepo->{$rel}->{repo} . 
+		     "$repo/i386/" . 
+		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
+		     basename $pkg->{rpm}->filename;
+	    push @d, $distrepo->{$rel}->{repo} . 
+		     "$repo/x86_64/" . 
+		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
+		     basename $pkg->{rpm}->filename;
+	} elsif ( $pkg->{arch} =~ m{^(i[356]86)$} ) {
+	    push @d, $distrepo->{$rel}->{repo} . 
+		     "$repo/i386/" . 
+		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
+		     basename $pkg->{rpm}->filename;
+	} elsif ( $pkg->{arch} eq 'x86_64' ) {
+	    push @d, $distrepo->{$rel}->{repo} . 
+		     "$repo/x86_64/" . 
+		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
+		     basename $pkg->{rpm}->filename;
+	} elsif ( $pkg->{arch} eq 'zsrc' ) {
+	    push @d, $distrepo->{$rel}->{repo} . 
+		     "$repo/SRPMS/" . 
+		     basename $pkg->{rpm}->filename;
+	} else {
+	    printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (bad arch: ', $pkg->{arch}, ')');
+	}
+    }
+    return @d;
+}
+
+sub movepkg {
+    my ($pkg, $repo, $done, $remove) = @_;
+    defined $done or $done = 2;
+    defined $remove or $remove = 0;
+    $remove = 0 if rprop($pkg, 'base') || rprop($pkg, 'builds');
+    $remove = 1 if $repo eq 'delete';
+
+    if ( $repo eq 'delete' && ( rprop($pkg, 'base') || (  rprop($pkg, 'builds') && $done == 1 ) ) ) {
+	tagpkg($pkg, 'inuse', 1);
+    } else {
+	printline('bold magenta', 1, "       - ($repo) ", $pkg->{rpm}->filename) if $opts{d};
+	my $color = 'bold white';
+	$color = 'bold yellow' if rprop($pkg, 'builds');
+	$color = 'dark green' if $repos->{$repo} && $repos->{$repo}->{devel};
+	$color = 'dark red' if $repo eq 'delete';
+	push @{$pkg->{repos}}, $repo unless $repo eq 'delete';
+	$pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo};
+	$pkg->{repo} = $repo;
+	$pkg->{remove}++ if $remove;
+	printline($color, 1, ' - ', $pkg->{rpm}->filename, ' (', $pkg->{oldrepo}, " to $repo)") if $opts{v} || $opts{d};
+	done($pkg) if $done;
+    }
+}
+
+sub tagpkg {
+    my ($pkg, $tag, $done) = @_;
+
+    printline('bold magenta', 1, "       - ($tag) ", $pkg->{rpm}->filename) if $opts{d};
+    delete $pkg->{obsolete} if $pkg->{obsolete};
+    $pkg->{$tag}++;
+    done($pkg) if $done;
+}
+
+sub done {
+    my $pkg = shift;
+    printline('bold yellow on_red', 1, " - ", $pkg->{rpm}->filename, " (already processed)") if $pkg->{done};
+    $pkg->{done}++;
+    delete $pkg->{obsolete} if $pkg->{obsolete};
+
+    if ( $repos->{$pkg->{repo}} && ! rprop($pkg, 'base') && ! rprop($pkg, 'builds') ) {
+	unless ( $pkg->{oldrepo} ) {
+	    my $goodarch = 0;
+	    $goodarch++ if $pkg->{rpm}->filename =~ m{/(i386|x86_64)/.*\.noarch\.rpm$};
+	    $goodarch++ if $pkg->{rpm}->filename =~ m{/i386/.*\.(i[56]86)\.rpm$};
+	    $goodarch++ if $pkg->{rpm}->filename =~ m{/(noarch|i[356]86|x86_64)/.*\.\1\.rpm$};
+	    printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (wrong arch)') unless $goodarch;
+	}
+	push @{$archs->{$pkg->{repo}}->{$pkg->{rpm}->as_nvre}->{$pkg->{rpm}->is_source_package ? 'src' : $pkg->{rpm}->arch}}, $pkg;
+    }
+}
+
+sub printline {
+    my $color = shift;
+    my $nline = shift;
+    my $string = join '', @_;
+
+    if ( $nline ) {
+	print "\n" unless $newline;
+	$newline++; 
+    } else {
+	$newline = 0;
+	print "\r\e[0K";
+    }
+    print color $color;
+    print $string;
+    print color 'reset';
+    print "\n" if $nline;
+}
+
+sub loadpkg {
+    printline('white', 0, "Loading: $_") if -d _;
+    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+.rpm} && ( ! $opts{r} || $1 =~ m{$opts{r}} );
+
+    my $pkg;
+    eval { $pkg = RPM2->open_package($_, $rpm_flags); };
+    if ($@) { printline('bold yellow on_red', 1, "Corrupt package $_"); return; }
+    eval { my $sig = $pkg->siggpg };
+    my $nosig = ! $@;
+    if ( $nosig && ! -f "$HOME/.rpmpass" ) {
+	printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)');
+	return;
+    }
+    
+    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+.rpm};
+    foreach my $repo ( keys %{$skippkg->{$rel}} ) { return if (dirname $pkg->filename) =~ m{/$repo/} && grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}}; }
+    (my $reponame = dirname $pkg->filename) =~ s{^.*\d/(sme[^/]+)/.*$}{$1};
+    $reponame = 'builds' if ( dirname $pkg->filename) =~ m{/smeserver-\d+-core/};
+
+    push @rpms, { base    => $srcname,
+		  name    => $pkg->name,
+		  repo    => $reponame,
+		  nvra    => $pkg->as_nvre . '.' . ( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
+		  arch    => $pkg->is_source_package ? 'zsrc' : $pkg->tag('ARCH'),
+		  version => $version,
+		  release => $release,
+		  rpm     => $pkg,
+		  nosig   => $nosig,
+		};
+    $sources{$srcname}++;
+    $pkgnames{$pkg->name} = $rpms[$#rpms] if ! $pkg->is_source_package && ( ! $pkgnames{$pkg->name} || $pkg gt $pkgnames{$pkg->name}->{rpm} );
+}
+
+sub loadbase {
+    printline('white', 0, "Loading: $_") if -d _;
+    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+.rpm} && ($pkgnames{$1} || $sources{$1});
+
+    my $pkg;
+    eval { $pkg = RPM2->open_package($_, $rpm_flags); };
+    if ($@) { printline('bold yellow on_red', 1, "Corrupt package $_"); return; }
+    eval { my $sig = $pkg->siggpg };
+    unless ($@) { printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)'); return; }
+
+    my $cmp = $pkgnames{$pkg->name};
+    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+.rpm};
+    my $pkgrepo = 'base';
+    foreach my $repo ( keys %{$skippkg->{$rel}} ) { 
+	if ( (dirname $pkg->filename) =~ m{/$repo/} ) {
+	    return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}}; 
+	    $pkgrepo = $repo;
+	    return unless $pkg->is_source_package || $cmp;
+	    return if ! $pkg->is_source_package && $pkg gt $cmp->{rpm} && rprop($cmp, 'base') && rprop($cmp, 'prio') > $repos->{$pkgrepo}->{prio};
+	    last;
+	}
+    }
+
+    push @rpms, { base    => $srcname,
+		  name    => $pkg->name,
+		  repo    => $pkgrepo,
+		  nvra    => $pkg->as_nvre . '.' . ( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
+		  arch    => $pkg->is_source_package ? 'zsrc' : $pkg->tag('ARCH'),
+		  version => $version,
+		  release => $release,
+		  rpm     => $pkg,
+		  nosig   => 0,
+		};
+    if ( ! $pkg->is_source_package && $pkg ge $cmp->{rpm} && ( $repos->{$pkgrepo}->{prio} >= rprop($cmp, 'prio') || ! rprop($cmp, 'base') ) ) {
+	$pkgnames{$pkg->name} = $rpms[$#rpms];
+    }
+}
+