status-report-scripts parseBZbugList,1.25,1.26

Christian Iseli (c4chris) fedora-extras-commits at redhat.com
Wed Apr 19 10:15:38 UTC 2006


Author: c4chris

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

Modified Files:
	parseBZbugList 
Log Message:
Add some checks.  Move to FC5.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- parseBZbugList	19 Apr 2006 10:14:27 -0000	1.25
+++ parseBZbugList	19 Apr 2006 10:15:36 -0000	1.26
@@ -7,7 +7,6 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
-#  - check that owners list is sorted
 
 use strict;
 use Getopt::Long;
@@ -15,14 +14,16 @@
 
 my %opt;
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s", "cvs=s" );
+		"extras_r=s", "core_r=s", "cvs=s" );
 
 $main::core
   = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::core_r
+  = "http://mirrors.kernel.org/fedora/core/5/source/SRPMS/";
 $main::extras
   = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
 $main::extras_r
-  = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+  = "http://mirrors.kernel.org/fedora/extras/5/SRPMS/";
 $main::discarded
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::bzid
@@ -35,6 +36,7 @@
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
+$main::extras_r = $opt{"core_r"} if defined $opt{"core_r"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
@@ -54,6 +56,7 @@
 my %BZA;
 my %BZB;
 my %CORE;
+my %CORE_R;
 my %EXTRAS;
 my %EXTRAS_R;
 my %SRPMS;
@@ -118,6 +121,7 @@
 }
 if (defined $opt{"o"}) {
   local *IN;
+  my $prev;
   open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
   # Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
   while ( <IN> ) {
@@ -125,6 +129,9 @@
     s/\s+$//;
     my @F = split /\|/;
     next if $F[1] eq "";
+    if ($F[1] lt $prev) {
+      print STDERR "Sorting problem in owners.list: $F[1] lt $prev\n";
+    }
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;
@@ -146,6 +153,9 @@
 if ($main::core ne "") {
   &grabRepoList($main::core, \%CORE);
 }
+if ($main::core_r ne "") {
+  &grabRepoList($main::core_r, \%CORE_R);
+}
 %SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
@@ -176,9 +186,14 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
+    if (defined($CORE{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
+      push @PL, $_;
+    }
     next if defined($OWN{$_}) || defined($DISCARD{$_});
     $CVS_NO_OWNER{$_} = 1;
   }
+  $PKG_LIST{"CVSinCore"} = \@PL;
+  $COUNT_LIST{'CVSinCore'} = $#PL + 1;
   close IN;
 }
 while ( <> ) {
@@ -300,9 +315,12 @@
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 &checkBugs(\%BZB);
 &checkMaintainers();
+&checkCoreAndExtras(\%CORE_R, \%EXTRAS_R, "release");
+&checkCoreAndExtras(\%CORE, \%EXTRAS, "devel");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
+&displayCommonWiki;
 &displayAcceptWiki(\%BZA);
 &displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
 &displayNewReviewWiki(\%BZN, "FE-NEW", 5);
@@ -317,6 +335,7 @@
 print STDERR "\nThe full report can be found here:\n";
 print STDERR "http://fedoraproject.org/wiki/Extras/PackageStatus\n\n";
 &displayOwnersMail;
+&displayCommonMail;
 &displayAcceptMail;
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
@@ -787,7 +806,9 @@
                   [$main::extras]
   -extras_r <url> Fedora extras SRPMS release repo
                   [$main::extras_r]
-  -core <url>     Fedora core SRPMS repo
+  -core <url>     Fedora core SRPMS development repo
+                  [$main::core]
+  -core_r <url>   Fedora core SRPMS release repo
                   [$main::core]
   -d <url>        list of migrated/discarded packages
                   [$main::discarded]
@@ -962,6 +983,12 @@
     print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
     print join("\n", @A), "}}}\n";
   }
+  if ($COUNT_LIST{'CVSinCore'} > 0) {
+    print "\n=== Packages appearing in Core but still present in CVS devel ===\n";
+    print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to Core: {{{\n";
+    my $a = $PKG_LIST{"CVSinCore"};
+    print join("\n", @$a), "}}}\n";
+  }
 }
 
 sub displayCVSMail {
@@ -975,6 +1002,13 @@
     $s =~ s/\n/\n    /sg;
     print STDERR "    $s\n";
   }
+  if ($COUNT_LIST{'CVSinCore'} > 0) {
+    print STDERR " - $COUNT_LIST{'CVSinCore'} packages in CVS devel *and* Core\n";
+    my $a = $PKG_LIST{"CVSinCore"};
+    my $s = &toLine(join(" ", @$a));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
+  }
 }
 
 sub checkBugs {
@@ -1052,3 +1086,43 @@
     print STDERR " - $COUNT_LIST{'maintpkg'} inactive maintainers\n";
   }
 }
+
+sub checkCoreAndExtras {
+  my ($c, $e, $tag) = @_;
+  my @PL;
+  foreach my $k (keys %$c) {
+    push @PL, $k if defined $e->{$k};
+  }
+  $PKG_LIST{"common$tag"} = \@PL;
+  $COUNT_LIST{"common$tag"} = $#PL + 1;
+}
+
+sub displayCommonWiki {
+  if ($COUNT_LIST{"commonrelease"} == 0 && $COUNT_LIST{"commondevel"} == 0) {
+    return;
+  }
+  print "\n== Duplicated packages in Core and Extras ==\n";
+  if ($COUNT_LIST{"commonrelease"} > 0) {
+    print "\nWe have $COUNT_LIST{'commonrelease'} packages duplicated for FC5:\n";
+    &displayPkgListByOwnerWiki($PKG_LIST{"commonrelease"});
+  }
+  if ($COUNT_LIST{"commondevel"} > 0) {
+    print "\nWe have $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
+    &displayPkgListByOwnerWiki($PKG_LIST{"commondevel"});
+  }
+}
+
+sub displayCommonMail {
+  if ($COUNT_LIST{"commonrelease"} == 0 && $COUNT_LIST{"commondevel"} == 0) {
+    return;
+  }
+  print STDERR "\nPackages appearing both in Core and Extras:\n";
+  if ($COUNT_LIST{"commonrelease"} > 0) {
+    print STDERR " - $COUNT_LIST{'commonrelease'} packages duplicated for FC5:\n";
+    &displayPkgListByOwnerMail($PKG_LIST{"commonrelease"});
+  }
+  if ($COUNT_LIST{"commondevel"} > 0) {
+    print STDERR " - $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
+    &displayPkgListByOwnerMail($PKG_LIST{"commondevel"});
+  }
+}




More information about the scm-commits mailing list