[devscripts] 01/03: dget: Match any priority for candidate version

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit e43ce786cb1479a522dcd146df6c2996bcb31e3f
Author: James McCoy <jamessan at debian.org>
Date:   Fri Dec 4 20:09:48 2015 -0500

    dget: Match any priority for candidate version
    
    When parsing the output of “apt-cache policy $package”, we choose the
    "Candidate" version of the package to download.  Then we try to find the
    matching portion of the output that lists the URLs where the package can
    be retrieved.
    
    In older versions of apt, this always listed a priority of 0, but with
    apt 1.1 the priority is properly reported.  Simply changing the match
    from 0 to any number allows dget to find the URIs again.
    
    Closes: #807064
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 3 +++
 scripts/dget.pl  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1dc53c0..bed0174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,6 +97,9 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
   [ James McCoy ]
   * debuild:
     + Use _all as the .changes arch for -A builds.  (Closes: #806262)
+  * dget:
+    + Remove unnecessary requirement that “apt-cache policy $pkg” shows a
+      priority of 0 for the Candidate version.  (Closes: #807064)
 
   [ Daniel Kahn Gillmor ]
   * debuild:
diff --git a/scripts/dget.pl b/scripts/dget.pl
index 6b35a31..844e848 100755
--- a/scripts/dget.pl
+++ b/scripts/dget.pl
@@ -280,7 +280,7 @@ sub apt_get {
 	    $version = $1;
 	    $qversion = quote_version($version);
 	}
-	if ($qversion and /^ [ *]{3} ($qversion) 0/) {
+	if ($qversion and /^ [ *]{3} ($qversion) \d/) {
 	    while (<$apt>) {
 		last OUTER unless /^  *(?:\d+) (\S+)/;
 		(my $host = $1) =~ s@/$@@;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git