r6241 - in /scripts/qa: Common.pm versioncheck.pl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Aug  3 19:51:41 2007
New Revision: 6241

URL: http://svn.debian.org/wsvn/?sc=1&rev=6241
Log:
Decouple source package name from directory name in svn trunk

Modified:
    scripts/qa/Common.pm
    scripts/qa/versioncheck.pl

Modified: scripts/qa/Common.pm
URL: http://svn.debian.org/wsvn/scripts/qa/Common.pm?rev=6241&op=diff
==============================================================================
--- scripts/qa/Common.pm (original)
+++ scripts/qa/Common.pm Fri Aug  3 19:51:41 2007
@@ -35,6 +35,11 @@
     # dam
     /pc1/ && do {
         $MIRROR = "http://proxy:9999";
+        $CPAN_MIRROR = "ftp://ftp.uni-sofia.bg/cpan";
+        last;
+    };
+    /beetle/ && do {
+        $MIRROR = "http://localhost:9999";
         $CPAN_MIRROR = "ftp://ftp.uni-sofia.bg/cpan";
         last;
     };

Modified: scripts/qa/versioncheck.pl
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck.pl?rev=6241&op=diff
==============================================================================
--- scripts/qa/versioncheck.pl (original)
+++ scripts/qa/versioncheck.pl Fri Aug  3 19:51:41 2007
@@ -367,9 +367,9 @@
 }
 
 # returns (version, URL)
-sub latest_upstream_from_cpan($$)
-{
-    my ($watch, $pkg) = @_;
+sub latest_upstream_from_cpan($)
+{
+    my ($watch) = @_;
 
     my @cpan = grep( $_->[0] =~ m{(?:^|\s)(?:http|ftp)://\S*cpan}i, @$watch );
 
@@ -492,22 +492,11 @@
 
 sub check_package($)
 {
-    my( $pkg ) = @_;
-
-    debugmsg( "Examining $pkg\n" );
-
-    my $in_archive = $packages{$pkg} || '';
-    debugmsg( sprintf(" - Archive has %s\n", $in_archive||'none') );
-
-    my $in_experimental = $experimental{$pkg};
-    debugmsg( sprintf( " - experimental has %s\n", $in_experimental||'none' ) );
-
-    my $in_stable = $stable{$pkg};
-    debugmsg( sprintf( " - stable has %s\n", $in_stable||'none' ) );
-
-    my $in_oldstable = $oldstable{$pkg};
-    debugmsg( sprintf( " - oldstable has %s\n", $in_oldstable||'none' ) );
-
+    my( $dir ) = @_;
+
+    debugmsg( "Examining $dir\n" );
+
+    my $pkg;
     my $changelog;
     my $changelog_fh = IO::Scalar->new( \$changelog );
 
@@ -516,7 +505,7 @@
     eval {
         $svn->cat(
             $changelog_fh,
-            "$SVN_REPO/trunk/$pkg/debian/changelog",
+            "$SVN_REPO/trunk/$dir/debian/changelog",
             'HEAD',
         );
         my $cl = Parse::DebianChangelog->init({instring=>$changelog});
@@ -529,6 +518,7 @@
             $in_svn = $_->Version;
             $svn_changer = $_->Maintainer;
             $svn_date = $_->Date;
+            $pkg = $_->Source;
             last;
         }
     };
@@ -543,6 +533,18 @@
             die $@;
         }
     }
+
+    my $in_archive = $packages{$pkg} || '';
+    debugmsg( sprintf(" - Archive has %s\n", $in_archive||'none') );
+
+    my $in_experimental = $experimental{$pkg};
+    debugmsg( sprintf( " - experimental has %s\n", $in_experimental||'none' ) );
+
+    my $in_stable = $stable{$pkg};
+    debugmsg( sprintf( " - stable has %s\n", $in_stable||'none' ) );
+
+    my $in_oldstable = $oldstable{$pkg};
+    debugmsg( sprintf( " - oldstable has %s\n", $in_oldstable||'none' ) );
 
 
     my $upstream = '';
@@ -555,7 +557,7 @@
         my $watch_io = IO::Scalar->new(\$watch);
         $svn->cat(
             $watch_io,
-            "$SVN_REPO/trunk/$pkg/debian/watch",
+            "$SVN_REPO/trunk/$dir/debian/watch",
             'HEAD',
         );
 
@@ -624,7 +626,7 @@
 
     if( @watch )
     {
-        ($in_cpan,  $upstream_url) = latest_upstream_from_cpan(\@watch, $pkg);
+        ($in_cpan,  $upstream_url) = latest_upstream_from_cpan(\@watch);
         debugmsg( sprintf( " - CPAN has %s (%s)\n", $in_cpan||'none', $upstream_url||'no url' ) );
         if( $in_cpan )
         {
@@ -641,7 +643,7 @@
     {
         $upstream ||= (
             ( $in_svn =~ /-.+$/ )
-            ? qq(Invalid <a href="http://svn.debian.org/wsvn/pkg-perl/trunk/$pkg/debian/watch?op=file&amp;rev=0&amp;sc=0">debian/watch</a>)
+            ? qq(Invalid <a href="http://svn.debian.org/wsvn/pkg-perl/trunk/$dir/debian/watch?op=file&amp;rev=0&amp;sc=0">debian/watch</a>)
             : $in_svn # native package
         );
     }
@@ -666,7 +668,7 @@
         print "<tr>\n";
         print "<td>$pkg</td>\n";
 
-        my $in_svn_text = qq(<a href="http://svn.debian.org/wsvn/pkg-perl/trunk/$pkg/debian/changelog?op=file&amp;rev=0&amp;sc=0" title="$svn_changer\n$svn_date">$in_svn</a>);
+        my $in_svn_text = qq(<a href="http://svn.debian.org/wsvn/pkg-perl/trunk/$dir/debian/changelog?op=file&amp;rev=0&amp;sc=0" title="$svn_changer\n$svn_date">$in_svn</a>);
         print "<td".(
             ($in_svn ne $in_archive)
             ? ' class="upload"'