--- builds_bin/update_repos	2007/11/07 21:14:58	1.25
+++ builds_bin/update_repos	2007/11/08 17:12:31	1.26
@@ -189,7 +189,9 @@ foreach my $smever ( sort { $a <=> $b }
 				tagpkg($cmp, 'inuse');
 				$pkg->{srpm}->{latest}++;
 			    }
-			    tagpkg($cmp, 'inuse') if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
+			    if ( $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds') || ( $cmp->{oldrepo} && $pkg->{repo} eq $cmp->{oldrepo} ) ) {
+				tagpkg($cmp, 'inuse')
+			    }
 			}
 			next if $pkg->{srpm} && $pkg->{srpm}->{rpm} eq $pkg->{rpm};
 
@@ -246,7 +248,7 @@ foreach my $smever ( sort { $a <=> $b }
 	    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} ) {
+	    } elsif ( $pkg->{srpm}->{repo} ne $pkg->{repo} && ( ! $pkg->{srpm}->{oldrepo} || $pkg->{srpm}->{oldrepo} ne $pkg->{repo} ) ) {
 		movepkg($pkg->{srpm}, $pkg->{repo}, 0);
 	    }
 	    unless ( $orig ) {
@@ -463,10 +465,6 @@ sub loadpkg {
     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}}; }
@@ -478,7 +476,10 @@ sub loadpkg {
     } elsif ( (dirname $pkg->filename) =~ m{\d/(sme[^/]+)/} ) {
 	$reponame = $1;
     }
-
+    if ( $nosig && ( ! -f "$HOME/.rpmpass" || $reponame eq 'builds' ) ) {
+	printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)');
+	return;
+    }
     push @rpms, { base    => $srcname,
 		  name    => $pkg->name,
 		  repo    => $reponame,