status-report-scripts parseBZbugList,1.72,1.73

[Christian Iseli (c4chris)]

Author: c4chris

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

Modified Files:
	parseBZbugList 
Log Message:
More post-merge cleanups.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- parseBZbugList	21 May 2007 22:49:27 -0000	1.72
+++ parseBZbugList	5 Jun 2007 13:25:03 -0000	1.73
@@ -49,7 +49,7 @@
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
-$main::currel = 6;
+$main::currel = 7;
 $main::firstrel = 7;
 $main::username = "c4chris";
 $main::BZusername = "";
@@ -88,7 +88,7 @@
 my %BZB;
 my %FEDORA_D;
 my @FEDORA_R;
-my @CORE_DROPPED_SRPMS;
+my @DROPPED_SRPMS;
 my @COMPS;
 my @COMPS_M;
 my %OWN;
@@ -242,20 +242,20 @@
     }
   }
 }
-&grabRepoList("$main::repourl/core/development/source/SRPMS/", \%FEDORA_D);
+&grabRepoList("$main::repourl/development/source/SRPMS/", \%FEDORA_D);
 $FEDORA_R[$main::currel + 1] = \%FEDORA_D;
 for my $i ($main::firstrel .. $main::currel) {
   $FEDORA_R[$i] = {};
-  &grabRepoList("$main::repourl/core/$i/source/SRPMS/", $FEDORA_R[$i]);
+  &grabRepoList("$main::repourl/releases/$i/Everything/source/SRPMS/", $FEDORA_R[$i]);
 }
 # Check comps files
 for my $i ($main::currel .. ($main::currel + 1)) {
-  print STDERR "Looking for $main::compsDir/comps-fe$i.xml.in\n";
+  print STDERR "Looking for $main::compsDir/comps-f$i.xml.in\n";
   if (-s "$main::compsDir/comps-f$i.xml.in") {
     my %F_RPM;
-    my $s = $i;
+    my $s = "releases/$i/Everything";
     $s = "development" if $i > $main::currel;
-    &grabRepoList("$main::repourl/core/$s/i386/os/Fedora/", \%F_RPM);
+    &grabRepoList("$main::repourl/$s/i386/os/Fedora/", \%F_RPM);
     if ($i == $main::currel + 1) {
       my @A = keys %F_RPM;
       $COUNT_LIST{"bin_rpms"} = $#A + 1;
@@ -1283,7 +1283,7 @@
   for (my $i = $main::currel; $i >= $main::firstrel; $i--) {
     foreach my $k (keys %{$FEDORA_R[$i]}) {
       unless ($FEDORA_D{$k} or $D{$k}) {
-	$CORE_DROPPED_SRPMS[$i]->{$k} = 1;
+	$DROPPED_SRPMS[$i]->{$k} = 1;
 	$D{$k} = 1;
       }
     }
@@ -1298,11 +1298,11 @@
   print "== About dropped packages ==\n\n";
   print "We have a total of $COUNT_LIST{'Dropped'} dropped packages.\n";
   for (my $i = $main::currel; $i >= $main::firstrel; $i--) {
-    my @A = keys %{$CORE_DROPPED_SRPMS[$i]};
+    my @A = keys %{$DROPPED_SRPMS[$i]};
     if ($#A >= 0) {
       my $n = $i + 1;
       $n = "devel" if $n > $main::currel;
-      print "\n=== FC packages dropped between release $i and $n ===\n";
+      print "\n=== Fedora packages dropped between release $i and $n ===\n";
       my $cnt = $#A + 1;
       print "\nWe have $cnt packages dropped:{{{\n";
       print &toLine(join(" ", sort @A)), "\n";
@@ -1313,9 +1313,9 @@
 
 sub displayDroppedMail {
   return if $COUNT_LIST{'Dropped'} == 0;
-  print STDERR "\nDropped FC packages:\n";
+  print STDERR "\nDropped Fedora packages:\n";
   print STDERR " - $COUNT_LIST{'Dropped'} packages were dropped",
-    " since FC $main::firstrel\n";
+    " since Fedora $main::firstrel\n";
 }
 
 sub checkComps {