status-report-scripts parseBZbugList,1.71,1.72
Christian Iseli (c4chris)
fedora-extras-commits at redhat.com
Mon May 21 22:49:29 UTC 2007
Author: c4chris
Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6444
Modified Files:
parseBZbugList
Log Message:
First stab at the merged era :-)
Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- parseBZbugList 10 Apr 2007 22:01:04 -0000 1.71
+++ parseBZbugList 21 May 2007 22:49:27 -0000 1.72
@@ -10,16 +10,10 @@
#
# To run this script, you will need the following data:
#
-# * the URL of packages available in the FE development repo (defaults to
-# http://mirrors.kernel.org/fedora/extras/development/SRPMS/)
-# * the URL of packages available in the FE release repo (defaults to
-# http://mirrors.kernel.org/fedora/extras/5/SRPMS/)
-# * the URL of packages available in the FC development repo (defaults to
-# http://mirrors.kernel.org/fedora/core/development/SRPMS/)
-# * the URL of packages available in the FC release repo (defaults to
-# http://mirrors.kernel.org/fedora/core/5/source/SRPMS/)
+# * the URL of packages available in the Fedora development repo (defaults to
+# http://mirrors.kernel.org/fedora/core/development/source/SRPMS/)
# * the owners.list file
-# * a full CVS checkout of Fedora Extras packages
+# * a full CVS checkout of Fedora packages
# TODO stuff
@@ -43,7 +37,7 @@
my $BZ_cooky = "# HTTP Cookie File
bugzilla.redhat.com FALSE /bugzilla FALSE 2145917104 COLUMNLIST opendate%20changeddate%20bug_severity%20assigned_to%20reporter%20bug_status%20resolution%20component%20blockedby%20short_desc\n";
my @BZ_URLs;
-# All open FE bug reports
+# All open Fedora bug reports
push @BZ_URLs,
"https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=6&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
@@ -56,7 +50,7 @@
= "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
$main::cvsDir = "/export/scratch/extras";
$main::currel = 6;
-$main::firstrel = 3;
+$main::firstrel = 7;
$main::username = "c4chris";
$main::BZusername = "";
$main::password = "";
@@ -83,7 +77,7 @@
my $FE_LEGAL = 182235;
my $FE_GUIDELINES = 197974;
my $FE_DEADREVIEW = 201449;
-my $extras_orphan = 'extras-orphan at fedoraproject.org';
+my $orphans = 'extras-orphan at fedoraproject.org';
my %NAME2REVIEW;
my %BZN;
my %BZS;
@@ -92,11 +86,8 @@
my %BZR;
my %BZA;
my %BZB;
-my %CORE_D;
-my @CORE_R;
-my %EXTRAS_D;
-my @EXTRAS_R;
-my %SRPMS;
+my %FEDORA_D;
+my @FEDORA_R;
my @CORE_DROPPED_SRPMS;
my @COMPS;
my @COMPS_M;
@@ -132,6 +123,7 @@
);
# Blacklist some packages for comps
my %COMPSBLACKLIST = (
+ "autodownloader" => 1,
"theora-exp" => 1,
"freetype1" => 1,
"paragui" => 1
@@ -250,46 +242,31 @@
}
}
}
-&grabRepoList("$main::repourl/core/development/source/SRPMS/", \%CORE_D);
-&grabRepoList("$main::repourl/extras/development/SRPMS/", \%EXTRAS_D);
-$EXTRAS_R[$main::currel + 1] = \%EXTRAS_D;
+&grabRepoList("$main::repourl/core/development/source/SRPMS/", \%FEDORA_D);
+$FEDORA_R[$main::currel + 1] = \%FEDORA_D;
for my $i ($main::firstrel .. $main::currel) {
- $CORE_R[$i] = {};
- if ($i >= 5) {
- &grabRepoList("$main::repourl/core/$i/source/SRPMS/", $CORE_R[$i]);
- } else {
- &grabRepoList("$main::repourl/core/$i/SRPMS/", $CORE_R[$i]);
- }
- $EXTRAS_R[$i] = {};
- if ($i >= 3) {
- &grabRepoList("$main::repourl/extras/$i/SRPMS/", $EXTRAS_R[$i]);
- }
-}
-%SRPMS = %EXTRAS_D;
-foreach my $k (keys %CORE_D) {
- $SRPMS{$k} = 1;
+ $FEDORA_R[$i] = {};
+ &grabRepoList("$main::repourl/core/$i/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";
- if (-s "$main::compsDir/comps-fe$i.xml.in") {
- my %C_RPM;
- my %E_RPM;
+ if (-s "$main::compsDir/comps-f$i.xml.in") {
+ my %F_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);
+ &grabRepoList("$main::repourl/core/$s/i386/os/Fedora/", \%F_RPM);
if ($i == $main::currel + 1) {
- my @A = keys %E_RPM;
+ my @A = keys %F_RPM;
$COUNT_LIST{"bin_rpms"} = $#A + 1;
}
- foreach my $k (keys % {$EXTRAS_R[$i]}) {
- $E_RPM{$k} = 1;
+ foreach my $k (keys % {$FEDORA_R[$i]}) {
+ $F_RPM{$k} = 1;
}
$COMPS[$i] = {};
$COMPS_M[$i] = {};
- &grabCompsList("$main::compsDir/comps-fe$i.xml.in", $COMPS[$i]);
- &checkComps(\%E_RPM, $COMPS[$i], $COMPS_M[$i], $i, \%C_RPM);
+ &grabCompsList("$main::compsDir/comps-f$i.xml.in", $COMPS[$i]);
+ &checkComps(\%F_RPM, $COMPS[$i], $COMPS_M[$i], $i);
}
}
# Take a look at CVS stuff
@@ -308,7 +285,6 @@
}
close IN;
unlink $f;
- my @PL;
my @G = glob "$main::cvsDir/*";
foreach $_ (@G) {
s/^$main::cvsDir\///;
@@ -316,34 +292,26 @@
if (-d "$main::cvsDir/$_/devel") {
$COUNT_LIST{"CVS"} += 1;
} else {
- $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+ $DISCARD{$_} = 1 unless defined $FEDORA_D{$_};
next;
}
if (-f "$main::cvsDir/$_/devel/dead.package") {
- $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+ $DISCARD{$_} = 1 unless defined $FEDORA_D{$_};
} elsif (-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/README") {
- $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+ $DISCARD{$_} = 1 unless defined $FEDORA_D{$_};
} elsif (-f "$main::cvsDir/$_/devel/README.CVS") {
- $DISCARD{$_} = 1 unless defined $CORE_D{$_};
+ $DISCARD{$_} = 1 unless defined $FEDORA_D{$_};
} else {
print STDERR "Look in $main::cvsDir/$_/devel/\n";
}
next if defined($OWN{$_})
|| defined($DISCARD{$_})
- || defined($CORE_D{$_});
+ || defined($FEDORA_D{$_});
$CVS_NO_OWNER{$_} = 1;
}
- $PKG_LIST{"CVSinCore"} = \@PL;
- $COUNT_LIST{'CVSinCore'} = $#PL + 1;
close IN;
}
my ($tfh, $tfn) = tempfile();
@@ -447,14 +415,10 @@
&checkLowActivity(\%BZB, "OPEN-BUGS");
&checkBugs(\%BZB);
&checkMaintainers();
-&checkCoreAndExtras($CORE_R[$main::currel],
- $EXTRAS_R[$main::currel], "release");
-&checkCoreAndExtras(\%CORE_D, \%EXTRAS_D, "devel");
&checkDropped();
-print "[[TableOfContents]]\n\n= FE Package Status of ",
+print "[[TableOfContents]]\n\n= Fedora Package Status of ",
&UnixDate("today", "%b %e, %Y"), " =\n";
&displayOwnersWiki;
-&displayCommonWiki;
&displayAcceptWiki(\%BZA);
&displayNewReviewWiki(\%BZR, "FE-REVIEW", 'reporter');
&displayNewReviewWiki(\%BZN, "FE-NEW", 'reporter');
@@ -466,13 +430,12 @@
&displayMaintainersWiki();
&displayDroppedWiki();
&displayCompsWiki;
-print "----\nCategoryExtras\n";
-print STDERR "\n\nFE Package Status of ",
+print "----\nCategoryFedora\n";
+print STDERR "\n\nFedora Package Status of ",
&UnixDate("today", "%b %e, %Y"), "\n";
print STDERR "\nThe full report can be found here:\n";
-print STDERR "http://fedoraproject.org/wiki/Extras/PackageStatus\n\n";
+print STDERR "http://fedoraproject.org/wiki/PackageMaintainers/PackageStatus\n\n";
&displayOwnersMail;
-&displayCommonMail;
&displayAcceptMail;
&displayNewReviewMail("FE-REVIEW");
&displayNewReviewMail("FE-NEW");
@@ -493,15 +456,14 @@
my @NO;
my @NP;
my @NP_R;
- my @NPC;
my @OE;
- foreach my $k (keys %EXTRAS_D) {
+ foreach my $k (keys %FEDORA_D) {
next if defined $OWN{$k};
push @NO, $k
}
if ($#NO >= 0) {
- $COUNT_LIST{"extrasNoOwner"} = $#NO + 1;
- $PKG_LIST{"extrasNoOwner"} = \@NO;
+ $COUNT_LIST{"NoOwner"} = $#NO + 1;
+ $PKG_LIST{"NoOwner"} = \@NO;
}
for my $k (keys %OWN) {
my $l = lc $k;
@@ -509,19 +471,19 @@
if (defined $OWN{$l}) {
$OWN_DUP{$l} = $OWN{$l};
$OWN_DUP{$k} = $OWN{$k};
- if (defined($EXTRAS_D{$l}) || defined($CORE_D{$l})) {
+ if (defined $FEDORA_D{$l}) {
delete $OWN{$k};
next;
}
- if (defined($EXTRAS_D{$k}) || defined($CORE_D{$k})) {
+ if (defined $FEDORA_D{$k}) {
delete $OWN{$l};
}
}
}
- $OWNER_STAT{$extras_orphan} = [ 0, 0, 0, 0, {} ];
+ $OWNER_STAT{$orphans} = [ 0, 0, 0, 0, {} ];
foreach my $k (keys %OWN) {
my $a = $OWN{$k};
- next if $$a[0] ne "Fedora Extras";
+ next if (($$a[0] ne "Fedora Extras") && ($$a[0] ne "Fedora Core"));
$cnt += 1;
my $s = $OWNER_STAT{$$a[3]};
if (defined $s) {
@@ -531,21 +493,17 @@
$OWNER_STAT{$$a[3]} = [ 1, 0, 0, 0, {} ];
$s = $OWNER_STAT{$$a[3]};
}
- if ($$a[3] eq $extras_orphan) {
+ if ($$a[3] eq $orphans) {
$orphan += 1;
- push @OE, $k if defined $EXTRAS_D{$k};
+ push @OE, $k if defined $FEDORA_D{$k};
next;
} else {
$$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
}
- unless (defined $EXTRAS_D{$k}) {
- if (defined($CORE_D{$k})) {
- push @NPC, $k;
- next;
- }
+ unless (defined $FEDORA_D{$k}) {
next if defined $DISCARD{$k};
next if defined $INFRASTRUCTURE{$k};
- if (defined $EXTRAS_R[$main::currel]->{$k}) {
+ if (defined $FEDORA_R[$main::currel]->{$k}) {
push @NP_R, $k;
} else {
push @NP, $k;
@@ -563,13 +521,12 @@
$PKG_LIST{"NotDevelNotRel"} = \@NP;
$PKG_LIST{"NotDevel"} = \@NP_R;
$PKG_LIST{"OrphanDevel"} = \@OE;
- $PKG_LIST{"MovedToCore"} = \@NPC;
}
sub displayOwnersWiki {
print "== About owners file ==\n\n";
print "=== Package count ===\n\n";
- print "We have $COUNT_LIST{'owner'} extras packages in owners file.[[BR]]\n";
+ print "We have $COUNT_LIST{'owner'} packages in owners file.[[BR]]\n";
print "We have $COUNT_LIST{'bin_rpms'} binary rpms in the devel repo.[[BR]]\n";
print "There are $COUNT_LIST{'orphan'} orphans.\n";
print "\n=== Top $TopCount package owners ===\n";
@@ -595,11 +552,11 @@
&displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 'reporter');
&displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 'reporter');
}
- if ($COUNT_LIST{"extrasNoOwner"} > 0) {
+ if ($COUNT_LIST{"NoOwner"} > 0) {
print "\n\n=== Packages missing in owners.list ===\n";
- print "\nWe have $COUNT_LIST{'extrasNoOwner'} packages present in the ",
+ print "\nWe have $COUNT_LIST{'NoOwner'} packages present in the ",
"development repo which have no entry in `owners.list`:{{{\n";
- my $p = $PKG_LIST{"extrasNoOwner"};
+ my $p = $PKG_LIST{"NoOwner"};
print &toLine(join(" ", @$p)), "\n";
print "}}}\n";
}
@@ -615,15 +572,7 @@
print "\n=== Orphaned packages present in the development repo ===\n";
if ($#$a >= 0) {
my $cnt = $#$a + 1;
- print "\nWe have $cnt orphaned packages available in extras devel:{{{\n";
- print &toLine(join(" ", sort @$a)), "\n";
- print "}}}\n";
- }
- print "\n=== FE packages that moved to Fedora Core ===\n";
- $a = $PKG_LIST{"MovedToCore"};
- if ($#$a >= 0) {
- my $cnt = $#$a + 1;
- print "\nWe have $cnt packages that moved to core:{{{\n";
+ print "\nWe have $cnt orphaned packages available in devel:{{{\n";
print &toLine(join(" ", sort @$a)), "\n";
print "}}}\n";
}
@@ -634,21 +583,21 @@
my $rel = $main::currel + 1;
while (defined $COMPS[$rel]) {
if ($rel > $main::currel) {
- print "\n=== FE devel ===\n\n";
+ print "\n=== Fedora devel ===\n\n";
} else {
- print "\n=== FE $rel ===\n\n";
+ print "\n=== Fedora $rel ===\n\n";
}
my $cnt = $COUNT_LIST{"InComps$rel"};
- print "We have $cnt packages in comps-fe$rel file.[[BR]]\n";
+ print "We have $cnt packages in comps-f$rel file.[[BR]]\n";
$cnt = $COUNT_LIST{"CompsMiss$rel"};
if ($cnt > 0) {
- print "\n=== Packages not present in comps-fe$rel ===\n";
+ print "\n=== Packages not present in comps-f$rel ===\n";
print "\nWe have $cnt packages missing:\n";
&displayPkgListByOwnerWiki($PKG_LIST{"CompsMiss$rel"});
}
$cnt = $COUNT_LIST{"CompsOver$rel"};
if ($cnt > 0) {
- print "\n=== Packages listed in comps-fe$rel but not available ===\n";
+ print "\n=== Packages listed in comps-f$rel but not available ===\n";
print "\nWe have $cnt packages missing:\n";
&displayPkgListByOwnerWiki($PKG_LIST{"CompsOver$rel"});
}
@@ -767,10 +716,10 @@
&displayBL($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 'reporter');
&displayBL($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 'reporter');
}
- if ($COUNT_LIST{"extrasNoOwner"} > 0) {
- print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
+ if ($COUNT_LIST{"NoOwner"} > 0) {
+ print STDERR " - $COUNT_LIST{'NoOwner'} packages present in the ",
"development repo which have no owners entry\n";
- my $p = $PKG_LIST{"extrasNoOwner"};
+ my $p = $PKG_LIST{"NoOwner"};
my $s = &toLine(join(" ", sort @$p));
$s =~ s/\n/\n /sg;
print STDERR " $s\n";
@@ -783,16 +732,11 @@
$a = $PKG_LIST{"OrphanDevel"};
if ($#$a >= 0) {
my $cnt = $#$a + 1;
- print STDERR " - $cnt orphaned packages, yet available in extras devel\n";
+ print STDERR " - $cnt orphaned packages, yet available in devel\n";
my $s = &toLine(join(" ", sort @$a));
$s =~ s/\n/\n /sg;
print STDERR " $s\n";
}
- $a = $PKG_LIST{"MovedToCore"};
- if ($#$a >= 0) {
- my $cnt = $#$a + 1;
- print STDERR " - $cnt packages that moved to core\n";
- }
}
sub displayCompsMail {
@@ -800,14 +744,14 @@
my $rel = $main::currel + 1;
while (defined $COMPS[$rel]) {
my $cnt = $COUNT_LIST{"InComps$rel"};
- print STDERR " - $cnt packages in comps-fe$rel file\n";
+ print STDERR " - $cnt packages in comps-f$rel file\n";
$cnt = $COUNT_LIST{"CompsMiss$rel"};
if ($cnt > 0) {
- print STDERR " - $cnt packages missing from comps-fe$rel file\n";
+ print STDERR " - $cnt packages missing from comps-f$rel file\n";
}
$cnt = $COUNT_LIST{"CompsOver$rel"};
if ($cnt > 0) {
- print STDERR " - $cnt packages in comps-fe$rel but not in repo\n";
+ print STDERR " - $cnt packages in comps-f$rel but not in repo\n";
}
$rel -= 1;
}
@@ -821,20 +765,20 @@
my $a = $BZ->{$b};
next unless $a->{'bug_status'} eq "CLOSED";
my $pkg = $a->{'pkg_name'};
- unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
+ unless ($FEDORA_D{$pkg} == 1 || defined($OWN{$pkg})) {
$pkg =~ s/-[^-]+-[^-]+$//;
}
- unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
+ unless ($FEDORA_D{$pkg} == 1 || defined($OWN{$pkg})) {
$pkg = $a->{'pkg_name'};
$pkg =~ s/-[^-]+$//;
}
- unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
+ unless ($FEDORA_D{$pkg} == 1 || defined($OWN{$pkg})) {
$pkg = lc $a->{'pkg_name'};
- unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
+ unless ($FEDORA_D{$pkg} == 1 || defined($OWN{$pkg})) {
$pkg =~ s/-[^-]+-[^-]+$//;
}
}
- unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
+ unless ($FEDORA_D{$pkg} == 1 || defined($OWN{$pkg})) {
$pkg = lcfirst $a->{'pkg_name'};
}
unless (defined $BZREV_BUGS{$a->{'assigned_to'}}) {
@@ -849,8 +793,8 @@
next if defined $DISCARD{$pkg};
if (Date_Cmp($a->{'changeddate'}, $fourDaysAgo) < 0) {
#print STDERR "Date_Cmp $a->{'changeddate'} < $fourDaysAgo\n";
- if ($SRPMS{$pkg} == 1) {
- if (!defined($CORE_D{$pkg}) && !defined($OWN{$pkg})) {
+ if ($FEDORA_D{$pkg} == 1) {
+ if (!defined($FEDORA_D{$pkg}) && !defined($OWN{$pkg})) {
push @BLO, $b;
$COUNT_LIST{"missingOwner"} += 1;
}
@@ -950,13 +894,13 @@
my $a = $BZ->{$b};
next if $a->{'bug_status'} eq "CLOSED";
my $pkg = $a->{'pkg_name'};
- unless ($SRPMS{$pkg} == 1) {
+ unless ($FEDORA_D{$pkg} == 1) {
$pkg = lc $a->{'pkg_name'};
}
- unless ($SRPMS{$pkg} == 1) {
+ unless ($FEDORA_D{$pkg} == 1) {
$pkg = lcfirst $a->{'pkg_name'};
}
- if ($SRPMS{$pkg} == 1) {
+ if ($FEDORA_D{$pkg} == 1) {
$COUNT_LIST{"acceptOpenInDevel"} += 1;
push @BL, $b;
}
@@ -1035,13 +979,13 @@
where options are:
-help this help note
-bu <str> Bugzilla username
- -comps <dir> extras comps directory [$main::compsDir]
+ -comps <dir> comps directory [$main::compsDir]
-currel <int> current Fedora release number [$main::currel]
- -cvs <dir> extras CVS directory [$main::cvsDir]
+ -cvs <dir> CVS directory [$main::cvsDir]
-firstrel <int> first Fedora release number [$main::firstrel]
-o <file> owners.list file
-p <str> password (to retrieve members list)
- -repourl <url> Fedora core and extras SRPMS development repo base
+ -repourl <url> Fedora SRPMS development repo base
[$main::repourl]
-u <str> username (to retrieve members list) [$main::username]\n";
exit 1;
@@ -1230,17 +1174,11 @@
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 and also present in CVS devel ===\n";
- print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to/from Core: {{{\n";
- my $a = $PKG_LIST{"CVSinCore"};
- print join("\n", @$a), "}}}\n";
- }
@A = sort (keys %DISCARD);
if ($#A >= 0) {
- print "\n=== Packages dropped from Extras ===\n";
+ print "\n=== Packages dropped from Fedora ===\n";
my $cnt = $#A + 1;
- print "\nWe have $cnt packages dropped from extras:{{{\n";
+ print "\nWe have $cnt packages dropped:{{{\n";
print &toLine(join(" ", sort @A)), "\n";
print "}}}\n";
}
@@ -1257,17 +1195,10 @@
$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";
- }
@A = sort (keys %DISCARD);
if ($#A >= 0) {
my $cnt = $#A + 1;
- print STDERR " - $cnt packages were dropped from extras\n";
+ print STDERR " - $cnt packages were dropped from Fedora\n";
}
}
@@ -1347,53 +1278,11 @@
}
}
-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) {
- my $FC = "FC" . $main::currel;
- print "\nWe have $COUNT_LIST{'commonrelease'} packages duplicated for $FC:\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) {
- my $FC = "FC" . $main::currel;
- print STDERR " - $COUNT_LIST{'commonrelease'} packages duplicated for $FC:\n";
- &displayPkgListByOwnerMail($PKG_LIST{"commonrelease"});
- }
- if ($COUNT_LIST{"commondevel"} > 0) {
- print STDERR " - $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
- &displayPkgListByOwnerMail($PKG_LIST{"commondevel"});
- }
-}
-
sub checkDropped {
my %D;
for (my $i = $main::currel; $i >= $main::firstrel; $i--) {
- foreach my $k (keys %{$CORE_R[$i]}) {
- unless ($SRPMS{$k} or $D{$k}) {
+ foreach my $k (keys %{$FEDORA_R[$i]}) {
+ unless ($FEDORA_D{$k} or $D{$k}) {
$CORE_DROPPED_SRPMS[$i]->{$k} = 1;
$D{$k} = 1;
}
@@ -1415,7 +1304,7 @@
$n = "devel" if $n > $main::currel;
print "\n=== FC packages dropped between release $i and $n ===\n";
my $cnt = $#A + 1;
- print "\nWe have $cnt packages dropped from core:{{{\n";
+ print "\nWe have $cnt packages dropped:{{{\n";
print &toLine(join(" ", sort @A)), "\n";
print "}}}\n";
}
@@ -1425,18 +1314,17 @@
sub displayDroppedMail {
return if $COUNT_LIST{'Dropped'} == 0;
print STDERR "\nDropped FC packages:\n";
- print STDERR " - $COUNT_LIST{'Dropped'} packages were dropped from core",
+ print STDERR " - $COUNT_LIST{'Dropped'} packages were dropped",
" since FC $main::firstrel\n";
}
sub checkComps {
- my ($rh, $ch, $mh, $tag, $coreh) = @_;
+ my ($rh, $ch, $mh, $tag) = @_;
my $prev;
- foreach my $k (sort(keys(%$rh), keys(%$coreh))) {
+ foreach my $k (sort(keys(%$rh))) {
next if index($k, "$prev-") == 0;
$prev = $k;
next if defined $COMPSBLACKLIST{$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;
More information about the fedora-extras-commits
mailing list