r39089 - in /trunk/dh-make-perl: debian/changelog lib/Debian/AptContents.pm t/AptContents.t t/contents/sources.list

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Wed Jul  1 20:09:39 2009
New Revision: 39089

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39089
Log:
Change parsing of sources.list in Debian::AptContents to make it work with
file:/ URIs, add a test. Thanks to Raphael Geissert for the bug report
(closes: #535017).

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/Debian/AptContents.pm
    trunk/dh-make-perl/t/AptContents.t
    trunk/dh-make-perl/t/contents/sources.list

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=39089&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Wed Jul  1 20:09:39 2009
@@ -1,9 +1,15 @@
 dh-make-perl (0.57) UNRELEASED; urgency=low
 
+  [ Nathan Handler ]
   * Bump Standards-Version to 3.8.2
     + in debian/control (no changes needed)
     + in generated package's debian/control
     + in t/dists
+
+  [ gregor herrmann ]
+  * Change parsing of sources.list in Debian::AptContents to make it work with
+    file:/ URIs, add a test. Thanks to Raphael Geissert for the bug report
+    (closes: #535017).
 
  -- Nathan Handler <nhandler at ubuntu.com>  Wed, 17 Jun 2009 13:24:08 +0000
 

Modified: trunk/dh-make-perl/lib/Debian/AptContents.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/AptContents.pm?rev=39089&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/AptContents.pm (original)
+++ trunk/dh-make-perl/lib/Debian/AptContents.pm Wed Jul  1 20:09:39 2009
@@ -152,10 +152,8 @@
         (\S+)           # deb or deb-src
         \s+
         ([^:\s]+)       # ftp/http/file/cdrom
-        ://
-        (/?             # file:///
-            [^:/\s]+    # host name or path
-        )
+        ://?            # file:/ http:// ftp://
+        ([^:/\s]+)      # host name or path
         (?:
             :(\d+)      # optional port number
         )?
@@ -167,7 +165,7 @@
         (\S+)           # distribution
         (?:
             \s+
-            (.+)            # components
+            (.+)        # components
         )?
     }x;
 

Modified: trunk/dh-make-perl/t/AptContents.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/AptContents.t?rev=39089&op=diff
==============================================================================
--- trunk/dh-make-perl/t/AptContents.t (original)
+++ trunk/dh-make-perl/t/AptContents.t Wed Jul  1 20:09:39 2009
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 19;
+use Test::More tests => 20;
 
 BEGIN {
     use_ok 'Debian::AptContents';
@@ -72,6 +72,13 @@
     'source line conversion 5',
 );
 
+is(
+    $apt_contents->repo_source_to_contents_path(
+        'deb file:/home/jason/debian stable main contrib non-free'),
+    'home_jason_debian_dists_stable',
+    'source line conversion 6',
+);
+
 $apt_contents = instance();
 
 is_deeply(

Modified: trunk/dh-make-perl/t/contents/sources.list
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/contents/sources.list?rev=39089&op=diff
==============================================================================
--- trunk/dh-make-perl/t/contents/sources.list (original)
+++ trunk/dh-make-perl/t/contents/sources.list Wed Jul  1 20:09:39 2009
@@ -8,3 +8,4 @@
 deb     http://debian.cihar.com/ unstable main contrib non-free
 deb-src http://debian.cihar.com/ unstable main contrib non-free
 deb http://nightlies.videolan.org/build/sid-i386/arch ./
+deb file:/home/jason/debian stable main contrib non-free