[devscripts] 04/07: Revert "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 8769fbeead6c52210e44cff8810e4096bd03ed41
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Sep 13 18:16:10 2015 +0900

    Revert "uscan: --verbose"
    
    This reverts commit ec64b2f86b26da9040880cf595b3ce817c446c62.
---
 scripts/uscan.pl | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index a401544..33f3ad4 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1547,30 +1547,20 @@ 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) {
-	    spawn(exec => \@cmd,
-		error_to_string => \$msg,
-		wait_child => 1);
-	    $msg = $msg . 
-		"Executing user specified script: $actioncmd; output:\n";
+	    my $msg = "Executing user specified script: $actioncmd; output:\n";
+	    $msg .= `$actioncmd 2>&1`;
 	    dehs_msg($msg);
 	} else {
-	    spawn(exec => \@cmd,
-		error_to_string => \$msg,
-		wait_child => 1);
-	    print "$msg\n" if $verbose;
+	    system(@cmd);
 	}
     }
 

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