New import: Tidy up output from gbp pq

[dgit.git] / dgit

diff --git a/dgit b/dgit
index cdf16700d4b9053f146731f6b68382a3e9f88cde..def2c349af4668589df46d30c7ba09d61b7a8d72 100755 (executable)
--- 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:);