aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/rpm
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-11-04 16:19:35 +0100
committerGuido Günther <agx@sigxcpu.org>2016-11-04 16:26:10 +0100
commitea5775a23e5223026b37100d23229b1bfc39bafa (patch)
tree3f715a64685ce1a5880a13d0706d8fea4cae8329 /gbp/rpm
parentced46db062f8e38c0eed7d1feb6e6e8b0d6435f9 (diff)
commands: allow to fall back to error reason if stderr is empty
Use this in PristineTar and SrcRpmFile to give better error messages if the command doesn't even get to print to stderr (i.e. missing on disk). Closes: #842592
Diffstat (limited to 'gbp/rpm')
-rw-r--r--gbp/rpm/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index 119d55ed..5a9a6688 100644
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -99,7 +99,7 @@ class SrcRpmFile(object):
c = gbpc.RunAtCommand('rpm2cpio',
[self.srpmfile, '|', 'cpio', '-id'],
shell=True, capture_stderr=True)
- c.run_error = "'%s' failed: {stderr}" % (" ".join([c.cmd] + c.args))
+ c.run_error = "'%s' failed: {stderr_or_reason}" % (" ".join([c.cmd] + c.args))
c(dir=dest_dir)