r14145 - /scripts/qa/templates/by_category

[tincho-guest at users.alioth.debian.org]

Author: tincho-guest
Date: Mon Feb  4 17:55:49 2008
New Revision: 14145

URL: http://svn.debian.org/wsvn/?sc=1&rev=14145
Log:
Don't show watchfile link when the problem is upgrade needed. Also avoid
linking twice to the watchfile

Modified:
    scripts/qa/templates/by_category

Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=14145&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Mon Feb  4 17:55:49 2008
@@ -172,19 +172,18 @@
 
         <td>[% INCLUDE bts_link pkg=pkg %]</td>
 
-        <td[% IF pkg.hilight.upstream %] class="todo"[% END %]><a href="[% IF
-                pkg.watch.upstream_mangled %][% pkg.watch.upstream_url | html
-                %][% ELSE %][% "${pkg.name}" | format("$wsvn_url")
-                %]/debian/watch?op=file&amp;rev=0&amp;sc=0[% END %]">[%
-                pkg.watch.upstream_mangled || pkg.watch.error
-            %]</a>
+        <td[% IF pkg.hilight.upstream %] class="todo"[% END %]>[% IF
+            pkg.watch.upstream_mangled %]<a href="[% 
+            pkg.watch.upstream_url | html %]">[%
+                pkg.watch.upstream_mangled
+            %]</a>[% ELSE %][% pkg.watch.error %][% END %]
             [% IF pkg.hilight.upstream %]
             [% IF pkg.watch.error %]
             <a href="[% "${pkg.name}" | format("$wsvn_url")
                         %]/debian/copyright?op=file&amp;rev=0&amp;sc=0"
                 class="watch-cp-info">(copyright info)</a>
             [% END %]
-            [% IF pkg.watch.error != "Missing" %]
+            [% IF pkg.watch.error != "Missing" AND ! pkg.status.needs_upgrade %]
             <a href="[% "${pkg.name}" | format("$wsvn_url")
                         %]/debian/watch?op=file&amp;rev=0&amp;sc=0"
                 class="watch-file">(watchfile)</a>