[devscripts] 01/01: origtargz: Force --download even when USCAN_DOWNLOAD=no

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit 4a3e770f429f791bcd4bac70187d7362e0bc208c
Author: Osamu Aoki <osamu at debian.org>
Date:   Sat Sep 30 11:07:30 2017 +0900

    origtargz: Force --download even when USCAN_DOWNLOAD=no
    
    Now uscan respect USCAN_DOWNLOAD=no.  So the fix proposed in
      8536b843 ("origtargz: Add --force-download to uscan --download-current version;
      recent uscan versions require it.", 2017-09-27)
    is reactivated in slightly different way.
    
    Basically, always override USCAN_DOWNLOAD=nowhen calling from origtargz.
    
    Signed-off-by: Osamu Aoki <osamu at debian.org>
---
 scripts/origtargz.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl
index 535d91f..9e971b5 100755
--- a/scripts/origtargz.pl
+++ b/scripts/origtargz.pl
@@ -62,7 +62,7 @@ B<apt-get source> is tried when B<apt-cache showsrc> reports a matching version.
 
 =item *
 
-Finally, B<uscan --download-current-version> is tried.
+Finally, B<uscan --download --download-current-version> is tried.
 
 =back
 
@@ -289,8 +289,8 @@ sub download_origtar ()
 	# try uscan
 
 	if (-f "debian/watch") {
-		print "Trying uscan --download-current-version ...\n";
-		system "uscan --download-current-version --rename\n";
+		print "Trying uscan --download --download-current-version ...\n";
+		system "uscan --download --download-current-version --rename\n";
 	}
 
 	if (my @f = glob "../${package}_$fileversion.orig.tar.*") {

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