r6696 - /scripts/qa/versioncheck2.pl

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

Author: tincho-guest
Date: Thu Aug 16 02:40:15 2007
New Revision: 6696

URL: http://svn.debian.org/wsvn/?sc=1&rev=6696
Log:
Fixed the problem with using directory names as source pkg names

Modified:
    scripts/qa/versioncheck2.pl

Modified: scripts/qa/versioncheck2.pl
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck2.pl?rev=6696&op=diff
==============================================================================
--- scripts/qa/versioncheck2.pl (original)
+++ scripts/qa/versioncheck2.pl Thu Aug 16 02:40:15 2007
@@ -793,80 +793,81 @@
     $total++;
 
     debugmsg("Examining $_\n" );
-    my $pkg = $maindata{$_};
-
-    debugmsg(sprintf(" - Archive has %s\n", $packages{$_} || 'none'));
+    my $pkgd = $maindata{$_};
+    my $spkg = $maindata{$_}{chl_pkg};
+
+    debugmsg(sprintf(" - Archive has %s\n", $packages{$spkg} || 'none'));
     debugmsg(sprintf(" - experimental has %s\n",
-            $experimental{$pkg} || 'none'));
-    debugmsg(sprintf(" - stable has %s\n", $stable{$pkg} || 'none'));
-    debugmsg(sprintf(" - oldstable has %s\n", $oldstable{$pkg} || 'none'));
-    debugmsg(sprintf(" - incoming has %s\n", $incoming{$pkg} || 'none' ));
-    debugmsg(sprintf(" - NEW has %s\n", $new{$pkg} || 'none'));
+            $experimental{$spkg} || 'none'));
+    debugmsg(sprintf(" - stable has %s\n", $stable{$spkg} || 'none'));
+    debugmsg(sprintf(" - oldstable has %s\n", $oldstable{$spkg} || 'none'));
+    debugmsg(sprintf(" - incoming has %s\n", $incoming{$spkg} || 'none' ));
+    debugmsg(sprintf(" - NEW has %s\n", $new{$spkg} || 'none'));
     debugmsg(sprintf(" - %s has %s (%s)\n",
-            $pkg->{watch_cpan} ? "CPAN" : "upstream",
-            $pkg->{watch_ver} || 'none', $pkg->{watch_url} || 'no url'));
+            $pkgd->{watch_cpan} ? "CPAN" : "upstream",
+            $pkgd->{watch_ver} || 'none', $pkgd->{watch_url} || 'no url'));
     debugmsg(sprintf(" - SVN has %s (upstream version=%s)\n",
-            $pkg->{chl_ver} || 'none', $pkg->{watch_unmangled_ver} || 'none'));
+            $pkgd->{chl_ver} || 'none', $pkgd->{watch_unmangled_ver} || 'none'));
 
     next unless($showalways or
-        $pkg->{watch_unmangled_ver} ne $pkg->{watch_ver}
+        $pkgd->{watch_unmangled_ver} ne $pkgd->{watch_ver}
             or
-        (! $packages{$_} or $pkg->{chl_ver} ne $packages{$_})
+        (! $packages{$spkg} or $pkgd->{chl_ver} ne $packages{$spkg})
             and
-        (! $incoming{$_} or $pkg->{chl_ver} ne $incoming{$_})
+        (! $incoming{$spkg} or $pkgd->{chl_ver} ne $incoming{$spkg})
             and
-        (! $new{$_} or $pkg->{chl_ver} ne $new{$_})
+        (! $new{$spkg} or $pkgd->{chl_ver} ne $new{$spkg})
     );
     $total_shown++;
     my $text = "<tr>\n";
-    $text .= "<td>$_</td>\n";
+    $text .= "<td>$spkg</td>\n";
 
     $text .= "<td".(
-        (! $packages{$_} or $pkg->{chl_ver} ne $packages{$_})
+        (! $packages{$spkg} or $pkgd->{chl_ver} ne $packages{$spkg})
         ? ' class="upload">'
         : '>');
-    $text .= qq(<a href="http://svn.debian.org/wsvn/pkg-perl/trunk/$_/debian/changelog?op=file&amp;rev=0&amp;sc=0" title=") . $pkg->{chl_changer} . "\n" . $pkg->{chl_date} . "\">" .$pkg->{chl_ver} . "</a></td>\n";
+    $text .= qq(<a href="http://svn.debian.org/wsvn/pkg-perl/trunk/$_/debian/changelog?op=file&amp;rev=0&amp;sc=0" title=") . $pkgd->{chl_changer} . "\n" . $pkgd->{chl_date} . "\">" .$pkgd->{chl_ver} . "</a></td>\n";
 
     my $archive_text = join(
         "\n",
-        $packages{$_}||(),
+        $packages{$spkg}||(),
         (
-            ($incoming{$_})
-            ? "Incoming:&nbsp;$incoming{$_}"
+            ($incoming{$spkg})
+            ? "Incoming:&nbsp;$incoming{$spkg}"
             : ()
         ),
         (
-            ($new{$_})
-            ? "NEW:&nbsp;$new{$_}"
+            ($new{$spkg})
+            ? "NEW:&nbsp;$new{$spkg}"
             : ()
         ),
         (
-            ($experimental{$_})
-            ? "experimental:&nbsp;$experimental{$_}"
+            ($experimental{$spkg})
+            ? "experimental:&nbsp;$experimental{$spkg}"
             : ()
         ),
         (
-            ($stable{$_} and not $packages{$_} and not $experimental{$_})
-            ? "stable:&nbsp;$stable{$_}"
+            ($stable{$spkg} and not $packages{$spkg} and not $experimental{$spkg})
+            ? "stable:&nbsp;$stable{$spkg}"
             : ()
         ),
         (
-            ($oldstable{$_} and not $stable{$_} and not $packages{$_} and not $experimental{$_})
-            ? "oldstable:&nbsp;$oldstable{$_}"
+            ($oldstable{$spkg} and not $stable{$spkg} and not $packages{$spkg} and not $experimental{$spkg})
+            ? "oldstable:&nbsp;$oldstable{$spkg}"
             : ()
         ),
     );
 
-    $archive_text = qq(<a href="http://packages.qa.debian.org/$_">$archive_text</a> [<a style="font-size:smaller" href="http://bugs.debian.org/src:$_">BTS</a>]) if $packages{$_} or $experimental{$_} or $stable{$_} or $oldstable{$_};
+    $archive_text = qq(<a href="http://packages.qa.debian.org/$spkg">$archive_text</a> [<a style="font-size:smaller" href="http://bugs.debian.org/src:$spkg">BTS</a>]) if $packages{$spkg} or $experimental{$spkg} or $stable{$spkg} or $oldstable{$spkg};
 
     $text .= "<td>$archive_text</td>\n";
 
     my $upstream_text = (
-        $pkg->{watch_cpan} ? "CPAN:&nbsp;" : "") . $pkg->{watch_ver};
-    $upstream_text = qq(<a href=") . $pkg->{watch_url} .  qq(">$upstream_text</a>) if $pkg->{watch_url};
+        $pkgd->{watch_cpan} ? "CPAN:&nbsp;" : "") . $pkgd->{watch_ver};
+    $upstream_text = qq(<a href=") . $pkgd->{watch_url} .  qq(">$upstream_text</a>) if $pkgd->{watch_url};
 
     $text .= (
-        ($pkg->{watch_unmangled_ver} ne $pkg->{watch_ver})
+        ($pkgd->{watch_unmangled_ver} ne $pkgd->{watch_ver})
         ? qq(<td class="upgrade">$upstream_text</td>\n)
         : "<td></td>\n"
     );