status-report-scripts parseBZbugList,1.52,1.53

[Christian Iseli (c4chris)]

Author: c4chris

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

Modified Files:
	parseBZbugList 
Log Message:
Stop using PackagesNoLongerInDevel.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- parseBZbugList	18 Oct 2006 13:24:32 -0000	1.52
+++ parseBZbugList	18 Oct 2006 13:51:10 -0000	1.53
@@ -19,8 +19,6 @@
 #   * the URL of packages available in the FC release repo (defaults to
 #     http://mirrors.kernel.org/fedora/core/5/source/SRPMS/)
 #   * the owners.list file
-#   * the URL to a wiki page containing the list of migrated/retired packages
-#     (defaults to Extras/PackagesNoLongerInDevel)
 #   * a full CVS checkout of Fedora Extras packages
 
 
@@ -54,8 +52,6 @@
 		"comps=s", "currel=i", "firstrel=i" );
 
 $main::repourl = "http://mirrors.kernel.org/fedora";
-$main::discarded
-  = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
@@ -66,7 +62,6 @@
 
 # Override any default settings with arguments that the user has supplied
 $main::repourl = $opt{"repourl"} if defined $opt{"repourl"};
-$main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 $main::compsDir = $opt{"comps"} if defined $opt{"comps"};
 $main::currel = $opt{"currel"} if defined $opt{"currel"};
@@ -101,7 +96,6 @@
 my %OWN_CVS_RECENT;
 my %MEMBER;
 my %CVS_NO_OWNER;
-my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
 my %MAINT_LIST;
@@ -137,27 +131,6 @@
   }
   close IN;
 }
-if ($main::discarded ne "") {
-  local *IN;
-  open IN, "wget -nv -O - \"$main::discarded\"|"
-    or die "Failed to wget $main::discarded : $!";
-  while ( <IN> ) {
-    last if /^<p>These FE packages became integrated into a FC package/;
-  }
-  while ( <IN> ) {
-    last if /^<pre>/;
-  }
-  while ( <IN> ) {
-    last if /^<\/pre>/;
-    s/[\r\n]+$//;
-    s/\s.*$//;
-    $FC_INTEGRATED{$_} = 1;
-  }
-  while ( <IN> ) {
-    # Read the rest to avoid a broken pipe...
-  }
-  close IN;
-}
 if (defined $opt{"o"}) {
   local *IN;
   my $prev;
@@ -195,9 +168,6 @@
 foreach my $k (keys %CORE_D) {
   $SRPMS{$k} = 1;
 }
-foreach my $k (keys %FC_INTEGRATED) {
-  $SRPMS{$k} = 1;
-}
 # Check comps files
 for my $i ($main::currel .. ($main::currel + 1)) {
   print STDERR "Looking for $main::compsDir/comps-fe$i.xml.in\n";
@@ -508,7 +478,7 @@
       $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
     }
     unless (defined $EXTRAS_D{$k}) {
-      if (defined($CORE_D{$k}) || defined($FC_INTEGRATED{$k})) {
+      if (defined($CORE_D{$k})) {
 	push @NPC, $k;
 	next;
       }
@@ -1004,8 +974,6 @@
   -comps <dir>    extras comps directory [$main::compsDir]
   -currel <int>   current Fedora release number [$main::currel]
   -cvs <dir>      extras CVS directory [$main::cvsDir]
-  -d <url>        list of migrated/discarded packages
-                  [$main::discarded]
   -firstrel <int> first Fedora release number [$main::firstrel]
   -o <file>       owners.list file
   -repourl <url>  Fedora core and extras SRPMS development repo base