status-report-scripts parseBZbugList,1.35,1.36

[Christian Iseli (c4chris)]

Author: c4chris

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

Modified Files:
	parseBZbugList 
Log Message:
Try to detect and report packages dropped from Extras.  Update core devel repo URL.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- parseBZbugList	19 May 2006 12:31:53 -0000	1.35
+++ parseBZbugList	6 Jun 2006 22:16:14 -0000	1.36
@@ -176,18 +176,6 @@
     $FC_INTEGRATED{$_} = 1;
   }
   while ( <IN> ) {
-    last if /^<p>These FE packages have been retired/;
-  }
-  while ( <IN> ) {
-    last if /^<pre>/;
-  }
-  while ( <IN> ) {
-    last if /^<\/pre>/;
-    s/[\r\n]+$//;
-    s/\s.*$//;
-    $DISCARD{$_} = 1;
-  }
-  while ( <IN> ) {
     # Read the rest to avoid a broken pipe...
   }
   close IN;
@@ -206,19 +194,11 @@
       print STDERR "Sorting problem in owners.list: $F[1] lt $prev\n";
     }
     $prev = $F[1];
-    if (defined $DISCARD{$F[1]}) {
-      $DISCARD{$F[1]} += 1;
-      next;
-    }
     $OWN{$F[1]} = \@F;
   }
   close IN;
-  foreach my $k (keys %DISCARD) {
-    next if $DISCARD{$k} > 1;
-    print STDERR "$k is in the list of discarded pkgs, but not in owners\n";
-  }
 }
-&grabRepoList("$main::repourl/core/development/SRPMS/", \%CORE_D);
+&grabRepoList("$main::repourl/core/development/source/SRPMS/", \%CORE_D);
 &grabRepoList("$main::repourl/extras/development/SRPMS/", \%EXTRAS_D);
 for my $i ($main::firstrel .. $main::currel) {
   $CORE_R[$i] = {};
@@ -262,8 +242,23 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
-    if (defined($CORE_D{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
-      push @PL, $_;
+    if (-f "$main::cvsDir/$_/devel/$_.spec") {
+      if (defined($CORE_D{$_})) {
+	push @PL, $_;
+      }
+    } elsif ($_ =~ /^(.*[^0-9])[0-9]+$/
+	     && -f "$main::cvsDir/$_/devel/$1.spec") {
+      if (defined($CORE_D{$_})) {
+	push @PL, $_;
+      }
+    } elsif (-f "$main::cvsDir/$_/devel/dead.package") {
+      $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+    } elsif (-f "$main::cvsDir/$_/devel/README") {
+      $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+    } elsif (-f "$main::cvsDir/$_/devel/README.CVS") {
+      $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+    } else {
+      print STDERR "Look in $main::cvsDir/$_/devel/\n";
     }
     next if defined($OWN{$_}) || defined($DISCARD{$_});
     $CVS_NO_OWNER{$_} = 1;
@@ -1092,6 +1087,14 @@
     my $a = $PKG_LIST{"CVSinCore"};
     print join("\n", @$a), "}}}\n";
   }
+  @A = sort (keys %DISCARD);
+  if ($#A >= 0) {
+    print "\n=== Packages dropped from Extras ===\n";
+    my $cnt = $#A + 1;
+    print "\nWe have $cnt packages dropped from extras:{{{\n";
+    print &toLine(join(" ", sort @A)), "\n";
+    print "}}}\n";
+  }
 }
 
 sub displayCVSMail {
@@ -1112,6 +1115,11 @@
     $s =~ s/\n/\n    /sg;
     print STDERR "    $s\n";
   }
+  @A = sort (keys %DISCARD);
+  if ($#A >= 0) {
+    my $cnt = $#A + 1;
+    print STDERR " - $cnt packages were dropped from extras\n";
+  }
 }
 
 sub checkBugs {