[SCM] Git repository for devscripts branch, master, updated. v2.11.7-12-gafca12d

[James McCoy]

The following commit has been merged in the master branch:
commit afca12d6646b3312885b0bd8807b5ca7b05888a0
Author: James McCoy <jamessan at debian.org>
Date:   Sun May 27 17:11:16 2012 -0400

    debcheckout: Adapt find_repo() to determine the tarball name for native packages.
    
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 79aaeaf..da7546e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ devscripts (2.11.8) UNRELEASED; urgency=low
     + Determine the source package name when downloading the source tarball.
       This ensures the downloaded files aren't incorrectly removed after being
       downloaded.
+    + Adapt find_repo() to determine the tarball name for native packages.
 
  -- David Prévot <taffit at debian.org>  Sun, 06 May 2012 23:26:05 -0400
 
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 2e3b091..56f0c93 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -314,7 +314,7 @@ sub find_repo($$) {
     my ($pkg, $desired_ver) = @_;
     my @repo = ("", 0, "", "");
     my $found = 0;
-    my $version = "";
+    my ($nonepoch_version, $version) = ("", "");
     my $origtgz_name = "";
     my $type = "";
     my $url = "";
@@ -329,7 +329,8 @@ sub find_repo($$) {
 	    ($type, $url) = (lc($2), $3);
 	} elsif ($line =~ /^Version:\s*(.*)$/i) {
 	    $version = $1;
-	} elsif ($line =~ /^ [a-f0-9]{32} \d+ (\S+)\.orig\.tar\.$compression_re_file_ext$/) {
+	    ($nonepoch_version = $version) =~ s/^\d+://;
+	} elsif ($line =~ /^ [a-f0-9]{32} \d+ (\S+)(?:_\Q$nonepoch_version\E|\.orig)\.tar\.$compression_re_file_ext$/) {
 	    $origtgz_name = $1;
 	} elsif ($line =~ /^$/) {
 	    push (@repos, [$version, $type, $url, $origtgz_name])

-- 
Git repository for devscripts