--- builds_bin/checkrpms 2005/09/15 23:55:09 1.1 +++ builds_bin/checkrpms 2006/03/06 04:02:12 1.2 @@ -8,19 +8,19 @@ use Data::Dumper; my $rpm_flags = RPM2->vsf_nodsa; my $build_dir = "/builds/RPMS"; my @repositories = qw( - /mirrors/centos/4/updates/i386/RPMS/ - /mirrors/centos/4/os/i386/CentOS/RPMS/ - /mirrors/centos/4/dag/i386/RPMS.dag/ - /mirrors/centos/4/atrpms/i386/RPMS.stable/ - /mirrors/centos/4/dries/i386/RPMS.dries/ - /mirrors/fedora/updates/3/i386/ - /mirrors/fedora/3/i386/os/Fedora/RPMS/ - /mirrors/mitel/devel/repo/RPMS/ - /builds/rpms/RPMS/i686/ - /builds/rpms/RPMS/i586/ - /builds/rpms/RPMS/i386/ - /builds/rpms/RPMS/noarch/ - ); + /mirrors/centos/4/updates/i386/RPMS/ + /mirrors/centos/4/os/i386/CentOS/RPMS/ + /mirrors/dag/redhat/el4/en/i386/dag/RPMS/ + /mirrors/atrpms/el4-i386/atrpms/stable/ + /mirrors/dries/redhat/el3/en/i386/RPMS.dries + /mirrors/fedora/updates/3/i386/ + /mirrors/fedora/3/i386/os/Fedora/RPMS/ + /builds/rpms/RPMS/i686/ + /mirrors/mitel/devel/repo/RPMS + /builds/rpms/RPMS/i586/ + /builds/rpms/RPMS/i386/ + /builds/rpms/RPMS/noarch/ + ); opendir RPMS, $build_dir or die "Couldn't opendir $build_dir"; my %rpms = map { my $x = RPM2->open_package("$build_dir/$_", $rpm_flags); $x->tag('NAME') => $x; } grep { /\.rpm$/ } readdir RPMS; @@ -50,21 +50,21 @@ foreach my $rpm ( sort keys %rpms ) } } @headers = reverse sort { $a cmp $b } @headers; - if (grep { $_->filename =~ m#/centos.*/updates/# } @headers) + if (grep { $_->filename =~ m#/centos/[\d.]+/updates/# } @headers) { - @headers = grep { $_->filename !~ m#/centos.*/os/# } @headers; + @headers = grep { $_->filename !~ m#/centos/[\d.]+/os/# } @headers; } - if (grep { $_->filename =~ m#/centos.*/(updates|os|dag)/# } @headers) + if (grep { $_->filename =~ m#/centos/[\d.]+/(updates|os)/# || $_->filename =~ m#/dag/# } @headers) { - @headers = grep { $_->filename !~ m#/fedora.*/(updates|os)/# } @headers; - @headers = grep { $_->filename !~ m#/centos.*/atrpms/# } @headers; + @headers = grep { $_->filename !~ m#/fedora/# } @headers; + @headers = grep { $_->filename !~ m#/atrpms/# } @headers; } if ($#headers < 0) { print "$rpm\n"; print " ***** can't find $rpm in any repository *****\n"; } - elsif ( $headers[0]->filename !~ m#/centos.*/(updates|os)/# || $headers[0] ne $rpms{$rpm} ) + elsif ( $headers[0]->filename !~ m#/centos/[\d.]+/(updates|os)/# || $headers[0] ne $rpms{$rpm} ) { if (grep { $_ ne $rpms{$rpm} } @headers) {