r16094 - in /scripts/qa: DebianQA/Classification.pm qareport.cgi templates/by_category

tincho-guest at users.alioth.debian.org tincho-guest at users.alioth.debian.org
Sat Mar 1 21:36:42 UTC 2008


Author: tincho-guest
Date: Sat Mar  1 21:36:41 2008
New Revision: 16094

URL: http://svn.debian.org/wsvn/?sc=1&rev=16094
Log:
New category: upgrade_in_progress to differenciate from needs_upgrade. Also, implement {svn,archive}_nonmaint, which I forgot to complete

Modified:
    scripts/qa/DebianQA/Classification.pm
    scripts/qa/qareport.cgi
    scripts/qa/templates/by_category

Modified: scripts/qa/DebianQA/Classification.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Classification.pm?rev=16094&op=diff
==============================================================================
--- scripts/qa/DebianQA/Classification.pm (original)
+++ scripts/qa/DebianQA/Classification.pm Sat Mar  1 21:36:41 2008
@@ -66,6 +66,7 @@
 my %warn_hilight = (
     archive_nonmaint => "archive",
     svn_nonmaint => "svn",
+    upgrade_in_progress => "svn",
 );
 
 sub classify(@) {
@@ -137,6 +138,9 @@
             }
             if(deb_compare($repo_mangled_ver, $upstream_mangled_ver) < 0) {
                 $status{needs_upgrade} = 1;
+                $status{upgrade_in_progress} = 1 if(
+                    deb_compare($repo_unrel_mangled_ver,
+                        $upstream_mangled_ver) == 0);
             }
         }
         # Archive
@@ -158,21 +162,31 @@
         }
         if($CFG{common}{group_email}
                 and $data->{archive}{$pkg}{control}{maintainer}
-                and $data->{archive}{$pkg}{control}{uploaders}) {
-            $status{archive_foreign} = 1 unless(
-                grep({ /<\Q$CFG{common}{group_email}\E>/ } (
-                        @{$data->{archive}{$pkg}{control}{maintainer}},
-                        @{$data->{archive}{$pkg}{control}{uploaders}}
-                    )));
+                and $data->{archive}{$pkg}{control}{uploaders}
+                and not grep( { /<\Q$CFG{common}{group_email}\E>/ }
+                @{$data->{archive}{$pkg}{control}{uploaders}}
+            )) {
+            if(grep({ /<\Q$CFG{common}{group_email}\E>/ }
+                    @{$data->{archive}{$pkg}{control}{maintainer}}
+                )) {
+                $status{archive_nonmaint} = 1;
+            } else {
+                $status{archive_foreign} = 1;
+            }
         }
         if($CFG{common}{group_email}
                 and $data->{svn}{$pkg}{maintainer}
-                and $data->{svn}{$pkg}{uploaders}) {
-            $status{svn_foreign} = 1 unless(
-                grep({ /<\Q$CFG{common}{group_email}\E>/ } (
-                        @{$data->{svn}{$pkg}{maintainer}},
-                        @{$data->{svn}{$pkg}{uploaders}}
-                    )));
+                and $data->{svn}{$pkg}{uploaders}
+                and not grep( { /<\Q$CFG{common}{group_email}\E>/ }
+                @{$data->{svn}{$pkg}{uploaders}}
+            )) {
+            if(grep({ /<\Q$CFG{common}{group_email}\E>/ }
+                    @{$data->{svn}{$pkg}{maintainer}}
+                )) {
+                $status{svn_nonmaint} = 1;
+            } else {
+                $status{svn_foreign} = 1;
+            }
         }
         my(%hilight, %warning);
         foreach(keys %status) {

Modified: scripts/qa/qareport.cgi
URL: http://svn.debian.org/wsvn/scripts/qa/qareport.cgi?rev=16094&op=diff
==============================================================================
--- scripts/qa/qareport.cgi (original)
+++ scripts/qa/qareport.cgi Sat Mar  1 21:36:41 2008
@@ -69,8 +69,8 @@
 my @pkglist = get_pkglist();
 my $cls = classify(@pkglist);
 
-my( @no_prob, @for_upload, @for_upgrade, @weird, @waiting, @wip, @with_bugs,
-    @tagged, @all );
+my( @no_prob, @for_upload, @for_upgrade, @upgrade_wip, @weird, @waiting,
+    @wip, @with_bugs, @tagged, @all );
 
 my %ignore = map({ $_ => 1 } @{$params{ignore_keywords}});
 my %keywords = ();
@@ -100,6 +100,7 @@
     my $dest;   # like "destiny" :)
     my $status = $data->{status};   # to save some typing
 
+    $dest ||= \@upgrade_wip if($status->{upgrade_in_progress});
     $dest ||= \@for_upgrade if($status->{needs_upgrade});
     $dest ||= \@wip if($status->{name_mismatch});
     $dest ||= \@wip if($status->{not_finished}
@@ -178,6 +179,7 @@
             : (
                 all         => \@no_prob,
                 for_upgrade => \@for_upgrade,
+                upgrade_wip => \@upgrade_wip,
                 weird       => \@weird,
                 for_upload  => \@for_upload,
                 waiting     => \@waiting,

Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=16094&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Sat Mar  1 21:36:41 2008
@@ -245,6 +245,7 @@
 <h1><a href="${group_url}">${group_name}</a></h1>
 <table id="main_table">
     [% INCLUDE section data=data list=for_upgrade name="for_upgrade" title="Newer upstream available" %]
+    [% INCLUDE section data=data list=upgrade_wip name="upgrade_wip" title="Newer upstream available :: Work in progress" %]
     [% INCLUDE section data=data list=for_upload name="for_upload" title="Ready for upload" %]
     [% INCLUDE section data=data list=tagged name="tagged" title="Tagged but not in the archive (yet)" %]
     [% INCLUDE section data=data list=waiting name="waiting" title="NEW and incoming" %]




More information about the Pkg-perl-cvs-commits mailing list