[devscripts] 02/04: uscan: --verbose

[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 ec64b2f86b26da9040880cf595b3ce817c446c62
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Sep 6 17:01:24 2015 +0900

    uscan: --verbose
    
    [uscan] please offer debugging possibility for mangle rules
    https://bugs.debian.org/350454
    
     * start uupdate --verbose as needed
     * retain output of script if ---verbose
     * use dpkg::IPC as much to be consistent
---
 scripts/uscan.pl | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 33f3ad4..a401544 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1547,20 +1547,30 @@ EOF
 	if ($action =~ /^uupdate(\s|$)/) {
 	    push @cmd, "--no-symlink";
 	}
+	if ($verbose) {
+	    push @cmd, "--verbose";
+	}
 
 	if ($watch_version > 1) {
 	    push @cmd, "--upstream-version", $newversion, $path;
 	} else {
 	    push @cmd, $path, $newversion;
 	}
+	my $msg;
 	my $actioncmd = join(" ", @cmd);
 	print "-- Executing user specified script\n     $actioncmd\n" if $verbose;
 	if ($dehs) {
-	    my $msg = "Executing user specified script: $actioncmd; output:\n";
-	    $msg .= `$actioncmd 2>&1`;
+	    spawn(exec => \@cmd,
+		error_to_string => \$msg,
+		wait_child => 1);
+	    $msg = $msg . 
+		"Executing user specified script: $actioncmd; output:\n";
 	    dehs_msg($msg);
 	} else {
-	    system(@cmd);
+	    spawn(exec => \@cmd,
+		error_to_string => \$msg,
+		wait_child => 1);
+	    print "$msg\n" if $verbose;
 	}
     }
 

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