From 7a0d541064203fb3db4661fc9ed265d5c8308bf5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 8 Oct 2016 22:01:12 +0100 Subject: New import: Tidy up output from gbp pq gbp pq import can print some warnings if it doesn't like the patches much. There is no point showing these warnings to the user of `dgit clone' or `dgit fetch'. As for the warnings in split brain mode, we will leave those, and leave them with colour enabled. Signed-off-by: Ian Jackson --- dgit | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dgit') diff --git a/dgit b/dgit index cdf1670..def2c34 100755 --- a/dgit +++ b/dgit @@ -1843,7 +1843,14 @@ END local $ENV{GIT_AUTHOR_EMAIL} = $authline[1]; local $ENV{GIT_AUTHOR_DATE} = $authline[2]; - runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import); + eval { + runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output', + @gbp, qw(pq import); + }; + if ($@) { + { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; } + die $@; + } my $gapplied = git_rev_parse('HEAD'); my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:); -- cgit v1.2.3