diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-20 16:35:20 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-20 16:35:37 +0100 |
commit | 53389b4ddc2d290f83e439fe36081e2d3e8d4b4c (patch) | |
tree | cf7f6a8dc22c057ca57cc99441103882b46f7f2e /git-debrebase | |
parent | 0effa0aab06b3a56382729f79fbea79ae36531b8 (diff) |
git-debrebase: suppress gbp pq export output
Except in case of error. Closes:#901809.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 3458b12..fd05c6b 100755 --- a/git-debrebase +++ b/git-debrebase @@ -34,6 +34,7 @@ use Data::Dumper; use Getopt::Long qw(:config posix_default gnu_compat bundling); use Dpkg::Version; use File::FnMatch qw(:fnmatch); +use File::Copy; our ($opt_force, $opt_noop_ok, @opt_anchors); our ($opt_defaultcmd_interactive); @@ -1495,7 +1496,12 @@ sub make_patches_staged ($) { in_workarea sub { runcmd @git, qw(checkout -q -b bw), $secret_bw; runcmd @git, qw(checkout -q -b patch-queue/bw), $secret_head; - runcmd qw(gbp pq export); + my @gbp_cmd = (qw(gbp pq export)); + my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd; + if ($r) { + { local ($!,$?); copy('../gbp-pq-err', \*STDERR); } + failedcmd @gbp_cmd; + } runcmd @git, qw(add debian/patches); }; } |