[SCM] Git repository for devscripts branch, master, updated. v2.11.7-7-g3a21798

[James McCoy]

The following commit has been merged in the master branch:
commit 3a2179804cb5e377473361ce5cd0fc131d841e76
Author: James McCoy <jamessan at debian.org>
Date:   Wed May 16 21:30:53 2012 -0400

    dget: Fix handling of sources.list entries with a port.
    
    Closes: 672460
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index a0aa202..907be5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ devscripts (2.11.8) UNRELEASED; urgency=low
       (Closes: #672309)
   * Also note DEBCHANGE_MAINTTRAILER change in NEWS entry for 2.11.7.
     (Closes: #672973)
+  * dget:
+    + Fix handling of sources.list entries with a port. (Closes: 672460) Still
+      can't handle entries at the same domain but different ports until
+      #154868 is fixed.
 
  -- David Prévot <taffit at debian.org>  Sun, 06 May 2012 23:26:05 -0400
 
diff --git a/scripts/dget.pl b/scripts/dget.pl
index 0bee2ec..9ab1e13 100755
--- a/scripts/dget.pl
+++ b/scripts/dget.pl
@@ -320,7 +320,7 @@ sub apt_get {
     # find deb lines matching the hosts in the policy output
     my @repositories;
     # the regexp within the map below can be removed and replaced with only the quotemeta statement once bug #154868 is fixed
-    my $host_re = '(?:' . (join '|', map { my $host = quotemeta; $host =~ s/(?<=\\:\\\/\\\/)([^\\:]+)(?=\\\/)/$1(?::[0-9]+\)?/g; $host; } @hosts) . ')';
+    my $host_re = '(?:' . (join '|', map { my $host = quotemeta; $host =~ s@^(\w+\\:\\/\\/[^:/]+)\\/@$1(?::[0-9]+)?\\/@; $host; } @hosts) . ')';
     if (-f "/etc/apt/sources.list") {
 	$apt = new IO::File("/etc/apt/sources.list") or die "/etc/apt/sources.list: $!";
 	while (<$apt>) {

-- 
Git repository for devscripts