status-report-scripts parseBZbugList,1.47,1.48

[Christian Iseli (c4chris)]

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8178

Modified Files:
	parseBZbugList 
Log Message:
Try to produce reasonable list of missing packages in comps.xml.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- parseBZbugList	26 Jul 2006 16:23:27 -0000	1.47
+++ parseBZbugList	9 Aug 2006 22:51:56 -0000	1.48
@@ -29,8 +29,6 @@
 
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
-#  Check contents of comps.xml file (missing packages,
-#    retired/orphaned packages)
 
 use strict;
 use Getopt::Long;
@@ -217,15 +215,22 @@
   $SRPMS{$k} = 1;
 }
 # Check comps files
-for my $i ($main::firstrel .. ($main::currel + 1)) {
+for my $i ($main::currel .. ($main::currel + 1)) {
   print STDERR "Looking for $main::compsDir/comps-fe$i.xml.in\n";
   if (-s "$main::compsDir/comps-fe$i.xml.in") {
+    my %C_RPM;
+    my %E_RPM;
+    my $s = $i;
+    $s = "development" if $i > $main::currel;
+    &grabRepoList("$main::repourl/core/$s/i386/os/Fedora/RPMS/", \%C_RPM);
+    &grabRepoList("$main::repourl/extras/$s/i386/", \%E_RPM);
+    foreach my $k (keys % {$EXTRAS_R[$i]}) {
+      $E_RPM{$k} = 1;
+    }
     $COMPS[$i] = {};
     $COMPS_M[$i] = {};
-    print STDERR "Grab $i\n";
     &grabCompsList("$main::compsDir/comps-fe$i.xml.in", $COMPS[$i]);
-    print STDERR "Check $i\n";
-    &checkComps($EXTRAS_R[$i], $COMPS[$i], $COMPS_M[$i], $i);
+    &checkComps(\%E_RPM, $COMPS[$i], $COMPS_M[$i], $i, \%C_RPM);
   }
 }
 # Take a look at CVS stuff
@@ -692,7 +697,7 @@
     my $e = $PO{$owner};
     $owner =~ s/\@/ at /;
     $owner =~ s/\./ dot /g;
-    foreach my $p (@$e) {
+    foreach my $p (sort @$e) {
       print "||$owner||`$p`||\n";
     }
   }
@@ -1032,7 +1037,7 @@
   while ( <IN> ) {
     next unless /^<img \S+ alt=.\[   \].> <a href=.([^"]+)/;
     my $file = $1;
-    my ($pkg) = $file =~ /^(.*)-[^-]+-[^-]+\.src\.rpm/;
+    my ($pkg) = $file =~ /^(.*)-[^-]+-[^-]+\.[^.]+\.rpm/;
     die "Bad file: $file" if $pkg eq "";
     $h->{$pkg} = 1;
   }
@@ -1403,9 +1408,18 @@
 }
 
 sub checkComps {
-  my ($rh, $ch, $mh, $tag) = @_;
-  foreach my $k (keys %$rh) {
-    $mh->{$k} = -1 unless defined $ch->{$k};
+  my ($rh, $ch, $mh, $tag, $coreh) = @_;
+  my $prev;
+  foreach my $k (sort(keys(%$rh), keys(%$coreh))) {
+    next if index($k, "$prev-") == 0;
+    $prev = $k;
+    next if defined $coreh->{$k};
+    next if defined $ch->{$k};
+    next if $k =~ /plugin/i;
+    next if $k =~ /^(lib|compat-|xfce4-|gtk-|kmod-|fonts?-)/i;
+    next if $k =~ /(-devel|lib[s0-9]*|-python|-perl|-servers?|-clients?|-tools?)$/i;
+    next if $k =~ /(-contribs?|-docs?|-x?emacs|-utils?|-fonts?)$/i;
+    $mh->{$k} = -1;
   }
   foreach my $k (keys %$ch) {
     $mh->{$k} = 1 unless defined $rh->{$k};