r14253 - in /scripts/qa: DebianQA/Classification.pm qareport.cgi templates/by_category templates/default.css
tincho-guest at users.alioth.debian.org
tincho-guest at users.alioth.debian.org
Thu Feb 7 18:41:23 UTC 2008
Author: tincho-guest
Date: Thu Feb 7 18:41:23 2008
New Revision: 14253
URL: http://svn.debian.org/wsvn/?sc=1&rev=14253
Log:
Make use of the new tags info
Modified:
scripts/qa/DebianQA/Classification.pm
scripts/qa/qareport.cgi
scripts/qa/templates/by_category
scripts/qa/templates/default.css
Modified: scripts/qa/DebianQA/Classification.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Classification.pm?rev=14253&op=diff
==============================================================================
--- scripts/qa/DebianQA/Classification.pm (original)
+++ scripts/qa/DebianQA/Classification.pm Thu Feb 7 18:41:23 2008
@@ -47,6 +47,7 @@
my %error_hilight = (
archive_waiting => "archive",
+ tagged_wait => "archive",
needs_upload => "archive",
never_uploaded => "archive",
archive_foreign => "archive",
@@ -54,6 +55,7 @@
not_finished => "svn",
repo_ancient => "svn",
svn_foreign => "svn",
+ invalid_tag => "svn",
needs_upgrade => "upstream",
upstream_ancient => "upstream",
watch_error => "upstream",
@@ -76,19 +78,33 @@
my $archive_ver = $data->{archive}{$pkg}{most_recent};
my $svn_ver = $data->{svn}{$pkg}{version};
my $svn_unrel_ver = $data->{svn}{$pkg}{un_version};
+ my $tag_ver = $data->{svn}{$pkg}{tags}[-1];
+ my $tag_ok = ($tag_ver and $svn_ver
+ and not deb_compare($tag_ver, $svn_ver));
+ if($tag_ver and $svn_ver and deb_compare($tag_ver, $svn_ver) > 0) {
+ $status{invalid_tag} = 1;
+ }
if(not $svn_ver or not $archive_ver) {
if(not $svn_ver) {
$status{not_finished} = 1;
}
if(not $archive_ver) {
- $status{never_uploaded} = 1;
+ if($tag_ok) {
+ $status{tagged_wait} = 1;
+ } else {
+ $status{never_uploaded} = 1;
+ }
}
} elsif(deb_compare($archive_ver, $svn_ver) > 0) {
$status{repo_ancient} = 1;
push @notes, "$archive_ver > $svn_ver";
} elsif(deb_compare($archive_ver, $svn_ver) != 0
and not $svn_unrel_ver) {
- $status{needs_upload} = 1;
+ if($tag_ok) {
+ $status{tagged_wait} = 1;
+ } else {
+ $status{needs_upload} = 1;
+ }
}
# SVN versus upstream
my $repo_mangled_ver = $data->{svn}{$pkg}{mangled_ver};
Modified: scripts/qa/qareport.cgi
URL: http://svn.debian.org/wsvn/scripts/qa/qareport.cgi?rev=14253&op=diff
==============================================================================
--- scripts/qa/qareport.cgi (original)
+++ scripts/qa/qareport.cgi Thu Feb 7 18:41:23 2008
@@ -44,7 +44,7 @@
my $cls = classify(@pkglist);
my( @no_prob, @for_upload, @for_upgrade, @weird, @waiting, @wip, @with_bugs,
- @all );
+ @tagged, @all );
unless($cgi->param("show_all"))
{
@@ -61,11 +61,14 @@
my $dest; # like "destiny" :)
my $status = $data->{status}; # to save some typing
- $dest ||= \@for_upgrade if $status->{needs_upgrade};
- $dest ||= \@wip if $status->{not_finished} or $status->{invalid_svn_version};
- $dest ||= \@for_upload if $status->{needs_upload} or $status->{never_uploaded};
- $dest ||= \@weird if $status->{repo_ancient} or $status->{svn_ancient}
- or $status->{upstream_ancient};
+ $dest ||= \@for_upgrade if($status->{needs_upgrade});
+ $dest ||= \@wip if($status->{not_finished} or
+ $status->{invalid_svn_version} or $status->{invalid_tag});
+ $dest ||= \@tagged if($status->{tagged_wait});
+ $dest ||= \@for_upload if($status->{needs_upload} or
+ $status->{never_uploaded});
+ $dest ||= \@weird if($status->{repo_ancient} or $status->{svn_ancient} or
+ $status->{upstream_ancient});
$dest ||= \@wip if $status->{watch_error};
$dest ||= \@waiting if $status->{archive_waiting};
$dest ||= \@with_bugs if $status->{has_bugs};
@@ -139,6 +142,7 @@
weird => \@weird,
for_upload => \@for_upload,
waiting => \@waiting,
+ tagged => \@tagged,
wip => \@wip,
with_bugs => \@with_bugs,
)
Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=14253&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Thu Feb 7 18:41:23 2008
@@ -120,6 +120,12 @@
[% IF pkg.svn.section AND pkg.svn.section != "main" %]
<span class="section-$pkg.svn.section">[$pkg.svn.section]</span>
[% END #IF %]
+ [% IF pkg.status.tagged_wait %]
+ <span class="svn-tag-wait">[Tag: $pkg.svn.tags.last]</span>
+ [% END %]
+ [% IF pkg.status.invalid_tag %]
+ <span class="svn-tag-invalid">[Tag: $pkg.svn.tags.last]</span>
+ [% END %]
[% IF ! hide_binaries
AND pkg.svn.binaries AND pkg.svn.binaries.size
AND (
@@ -235,6 +241,7 @@
<table id="main_table">
[% INCLUDE section data=data list=for_upgrade name="for_upgrade" title="Newer upstream available" %]
[% 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" %]
[% INCLUDE section data=data list=weird name="weird" title="Packages with strange versions in the repository" %]
[% INCLUDE section data=data list=wip name="wip" title="Work in progress" %]
Modified: scripts/qa/templates/default.css
URL: http://svn.debian.org/wsvn/scripts/qa/templates/default.css?rev=14253&op=diff
==============================================================================
--- scripts/qa/templates/default.css (original)
+++ scripts/qa/templates/default.css Thu Feb 7 18:41:23 2008
@@ -85,6 +85,8 @@
.svn-unrel {
font-size: smaller;
}
+.svn-tag-invalid { font-size: smaller; color: red }
+.svn-tag-wait { font-size: smaller; color: navy }
.section-non-free { color: red; }
.section-contrib { color: maroon; }
.bts-wishlist {
More information about the Pkg-perl-cvs-commits
mailing list