summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2018-02-09 13:09:02 +0000
committerBen Brown <ben.brown@codethink.co.uk>2018-02-09 13:27:33 +0000
commiteac97eca8aa08d7f701807283f0b1e820b31fea0 (patch)
tree29ed4ac9f33edf9dc100713d437edc02edd5bc00
parentf697957b0cdcdaca9e3c623fe9ffd4131ba75f12 (diff)
downloadybd-eac97eca8aa08d7f701807283f0b1e820b31fea0.tar.gz
Improve error message on failure to generate rpm name from metadatabenbrown/misc-rpm-fixes
-rw-r--r--ybd/rpm.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ybd/rpm.py b/ybd/rpm.py
index d24827b..52d2f98 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -501,10 +501,9 @@ def rpm_deployment_filename(dn, rpmpath):
out = subprocess.check_output(['rpm', '-q', '-p', rpmpath, qf],
stderr=fnull)
except subprocess.CalledProcessError:
- app.log(dn, "ERROR: Failed to generate rpm name")
- sys.exit(1)
+ out = ""
if not out:
- app.log(dn, "ERROR: getting rpm deployment filename returned empty")
+ app.log(dn, "ERROR: Failed to generate name from %s headers" % rpmpath)
sys.exit(1)
return out