r6178 - /scripts/qa/versioncheck.pl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Jul 31 10:54:04 2007
New Revision: 6178

URL: http://svn.debian.org/wsvn/?sc=1&rev=6178
Log:
Nicer output when upstream is CPAN

Modified:
    scripts/qa/versioncheck.pl

Modified: scripts/qa/versioncheck.pl
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck.pl?rev=6178&op=diff
==============================================================================
--- scripts/qa/versioncheck.pl (original)
+++ scripts/qa/versioncheck.pl Tue Jul 31 10:54:04 2007
@@ -509,6 +509,7 @@
 
 
     my $upstream = '';
+    my $upstream_is_cpan;
     my $in_cpan = '';
     my @watch;
     eval {
@@ -587,7 +588,15 @@
     {
         $in_cpan = latest_upstream_from_cpan(\@watch, $pkg);
         debugmsg( sprintf( " - CPAN has %s\n", $in_cpan||'none' ) );
-        $upstream = $in_cpan || latest_upstream_from_watch(\@watch);
+        if( $in_cpan )
+        {
+            $upstream_is_cpan = 1;
+            $upstream = $in_cpan;
+        }
+        else
+        {
+            $upstream = latest_upstream_from_watch(\@watch);
+        }
         debugmsg( sprintf( " - upstream has %s\n", $upstream||'none' ) );
     }
     else
@@ -661,10 +670,10 @@
         print "<td>$archive_text</td>\n";
         print(
             ($up_svn ne $upstream)
-            ? "<td class=\"upgrade\">".join(
-                "\n",
-                $upstream,
-                ( $in_cpan ? "CPAN:&nbsp;$in_cpan" : () )
+            ? "<td class=\"upgrade\">".(
+                $upstream_is_cpan
+                ? "CPAN:&nbsp;$in_cpan"
+                : $upstream
             )."</td>\n"
             : "<td>&nbsp</td>\n"
         );