--- builds_bin/checkrpms	2007/01/17 14:50:10	1.6
+++ builds_bin/checkrpms	2007/07/19 19:59:15	1.19
@@ -6,33 +6,42 @@ use RPM2;
 use Data::Dumper;
 use Getopt::Std;
 
+my $centosrel = '4';
+my $fedorarel = '3';
+my $builds = '/builds/rpms';
+my $arch = `uname -i`;
+chomp $arch;
+
 my %opts;
-getopts( "s:", \%opts );
-my $src = $opts{s} || '/builds/RPMS';
+getopts( "als:", \%opts );
+my $src = $opts{s} || "/builds/RPMS-$arch";
 
-my $rpm_flags =  RPM2->vsf_nodsa;
-my @repositories = qw( 
-	/mirrors/centos/4/fasttrack/i386/RPMS/
-	/mirrors/centos/4/updates/i386/RPMS/
-	/mirrors/centos/4/os/i386/CentOS/RPMS/
-	/mirrors/centos/4/extras/i386/RPMS/
-	/mirrors/rpmforge/dag/redhat/el4/en/i386/dag/RPMS/
-	/mirrors/atrpms/el4-i386/atrpms/stable/
-	/mirrors/rpmforge/dag/dries/redhat/el4/en/i386/RPMS.dries/
-	/mirrors/fedora-legacy/fedora/3/updates/i386/
-	/mirrors/fedora-legacy/fedora/3/os/i386/
-	/builds/rpms/RPMS/i686/
-	/builds/rpms/RPMS/i586/
-	/builds/rpms/RPMS/i386/
-	/builds/rpms/RPMS/noarch/
-	);
+my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_nodsa;
+my @repos = (
+              "/mirrors/centos/$centosrel/fasttrack/$arch/RPMS",
+              "/mirrors/centos/$centosrel/updates/$arch/RPMS",
+              "/mirrors/centos/$centosrel/os/$arch/CentOS/RPMS",
+              "/mirrors/centos/$centosrel/os/$arch/CentOS",
+              "/mirrors/centos/$centosrel/extras/$arch/RPMS",
+              "/mirrors/fedora/epel/$centosrel/$arch",
+              "/mirrors/rpmforge/dag/redhat/el$centosrel/en/$arch/dag/RPMS",
+              "/mirrors/atrpms/el$centosrel-$arch/atrpms/stable",
+              "/mirrors/atrpms/el$centosrel-$arch/atrpms/testing",
+              "/mirrors/fedora/core/updates/$fedorarel/$arch",
+              "/mirrors/fedora/core/$fedorarel/$arch/os/Fedora/RPMS",
+              "/mirrors/fedora/extras/$fedorarel/$arch",
+              "$builds/RPMS/i686",
+              "$builds/RPMS/i586",
+              "$builds/RPMS/$arch",
+              "$builds/RPMS/noarch",
+            );
 
 opendir RPMS, $src or die "Couldn't opendir $src";
 my %rpms = map { my $x = RPM2->open_package("$src/$_", $rpm_flags); $x->tag('NAME') => $x; } grep { /\.rpm$/ } readdir RPMS;
 closedir RPMS;
 
 my %repos;
-foreach my $repo (reverse @repositories)
+foreach my $repo (reverse @repos)
 {
     my %temp_repo = map { $_ => $repo } grep { /\.rpm$/ } readdir RPMS if ( opendir RPMS, $repo );
     closedir RPMS;
@@ -49,29 +58,34 @@ foreach my $rpm ( sort keys %rpms )
     foreach my $file ( grep { /^$rpmfix-[0-9].*\.rpm$/ } keys %repos )
     {
         $header = RPM2->open_package("$repos{$file}/$file", $rpm_flags);
-        if ($header ge $rpms{$rpm} || $header->filename =~ m#/centos/[\d.]+/(os|updates|fasttrack|extras)/#)
+        if ($header ge $rpms{$rpm} || $header->filename =~ m#/centos/[\d.]+/(os|updates|fasttrack|extras)/#i || $opts{a})
         {
             push @headers, $header;
         }
     }
     @headers = reverse sort { $a cmp $b } @headers;
-    if (grep { $_->filename =~ m#/centos/[\d.]+/(updates|fasttrack)/# } @headers)
+    if (grep { $_->filename =~ m#/centos/[\d.]+/(os|updates|fasttrack|extras)/#i } @headers)
     {
-        @headers = grep { $_->filename !~ m#/centos/[\d.]+/os/# || $_ eq $rpms{$rpm} } @headers;
+        @headers = grep { $_->filename !~ m#/fedora/#i || $_->filename =~ m#/epel/#i || $_ eq $rpms{$rpm} } @headers;
     }
-    if (grep { $_->filename =~ m#/centos/[\d.]+/(os|updates|fasttrack|extras)/# || $_->filename =~ m#/dag/[^d]# } @headers)
-    {
-        @headers = grep { $_->filename !~ m#/atrpms/# || $_ eq $rpms{$rpm} } @headers;
-        @headers = grep { $_->filename !~ m#/fedora/# || $_ eq $rpms{$rpm} } @headers;
-        @headers = grep { $_->filename !~ m#/fedora-legacy/# || $_ eq $rpms{$rpm} } @headers;
+    unless ($opts{a}) {
+        if (grep { $_->filename =~ m#/centos/[\d.]+/(updates|fasttrack)/#i } @headers)
+        {
+            @headers = grep { $_->filename !~ m#/centos/[\d.]+/os/#i || $_ eq $rpms{$rpm} } @headers;
+        }
+        if (grep { $_->filename =~ m#/centos/[\d.]+/(os|updates|fasttrack|extras)/#i || $_->filename =~ m#/(dag|epel)/[^d]#i } @headers)
+        {
+            @headers = grep { $_->filename !~ m#/atrpms/#i || $_ eq $rpms{$rpm} } @headers;
+        }
     }
     if ($#headers < 0)
     {
         print "$rpm\n";
         print "  ***** can't find $rpm in any repository *****\n";
     }
-    elsif ( $headers[0]->filename !~ m#/centos/[\d.]+/(os|updates|fastrrack|extras)/#  || $headers[0] ne $rpms{$rpm} )
+    elsif ( $headers[0]->filename !~ m#/centos/[\d.]+/(os|updates|fastrrack|extras)/#i  || $headers[0] ne $rpms{$rpm} )
     {
+        next if $headers[0] eq $rpms{$rpm} && $opts{l};
         if (grep { $_ ne $rpms{$rpm} } @headers)
         {
             print "$rpm\n";
@@ -81,8 +95,8 @@ foreach my $rpm ( sort keys %rpms )
                 $path =~ s@^(.*)/.*@$1@;
                 my $filename = $rpms{$rpm}->filename;
                 $filename =~ s@^.*/(.*)@$1@;
-                print " " . ($header eq $rpms{$rpm} ? "** " : "-- ") . $header->as_nvre . " ($path)\n";
-                #print "     - rm $src/$filename; cp ". $header->filename . " $src\n";
+                print " " . ( $header eq $rpms{$rpm} ? "** " : ( $path =~ m#/centos/# ? "-- " : ".. " ) ) . $header->filename . "\n";
+                last if $header eq $rpms{$rpm}  && $opts{l};
             }
         }
     }