[devscripts] 01/05: uscan: Restore display of the final file name

[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 786ab8cf6df9c0a6cf1fa645ae6aaf21c0bd1c48
Author: James McCoy <jamessan at debian.org>
Date:   Mon May 26 11:39:46 2014 -0400

    uscan: Restore display of the final file name
    
    Tools like svn-upgrade parse the output of uscan and expect to see an
    orig.tar-like string in it.  In the mk-origtargz refactoring, this was
    dropped in non-verbose mode, breaking said tools.
    
    This restores the output of the final file name, in both normal and
    verbose mode.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  1 +
 scripts/uscan.pl | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72d7352..40d6d6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ devscripts (2.14.3) UNRELEASED; urgency=medium
       (Closes: #747901)
     + Add target-path node to dehs output for those who care about the actual
       path to the file.
+    + Restore display of final file name after file is donwloaded.
 
   [ Christoph Berg ]
   * uscan: Fix "upsteam" typo.  (Closes: #749343)
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index a3fc82e..820fd3a 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1485,12 +1485,7 @@ EOF
 	$target = $1 if $mk_origtargz_out =~ /Leaving (.*) where it is/;
     }
 
-    if ($verbose) {
-	print "-- Successfully downloaded updated package $newfile_base\n";
-	if (defined $mk_origtargz_out) {
-	    print "-- $mk_origtargz_out\n";
-	}
-    } elsif ($dehs) {
+    if ($dehs) {
 	my $msg = "Successfully downloaded updated package $newfile_base\n";
 	if (defined $mk_origtargz_out) {
 	    $msg .= "$mk_origtargz_out\n";
@@ -1499,6 +1494,13 @@ EOF
 	$dehs_tags{'target-path'} = $target;
 	dehs_msg($msg);
     }
+    else {
+	my $prefix = $verbose ? "-- " : "";
+	print $prefix ."Successfully downloaded updated package $newfile_base\n";
+	if (defined $mk_origtargz_out) {
+	    print $prefix ."$mk_origtargz_out\n";
+	}
+    }
 
     # Do whatever the user wishes to do
     if ($action) {

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