summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2018-02-13 19:14:15 +0000
committerJavier Jardón <jjardon@gnome.org>2018-02-13 19:14:15 +0000
commit75748c29a13dc9ce033aadf54174cc97de45c14d (patch)
treea7139f906aff368f347d6bd47d3251fb07b57726
parent0f389bec66f708a3d01d38ef732f6922f2255184 (diff)
parent5b38e6627f0f084f52b7b8186a04c90da5b9ea33 (diff)
downloadybd-75748c29a13dc9ce033aadf54174cc97de45c14d.tar.gz
Merge branch 'benbrown/fix-rpm-check' into 'master'
Fix rpm/rpmbuild error checking See merge request baserock/ybd!402
-rw-r--r--ybd/rpm.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ybd/rpm.py b/ybd/rpm.py
index 52d2f98..f7e29b6 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -567,9 +567,9 @@ def package_rpms(system, whitelist=None):
env_vars = sandbox.env_vars_for_build(system)
test_cmds = ['rpm --version', 'rpmbuild --version']
for cmd in test_cmds:
- error = sandbox.run_sandboxed(
+ success, _, _ = sandbox.run_sandboxed(
system, cmd, env_vars, exit_on_error=False)
- if error:
+ if not success:
log('RPM-BUILD', 'To generate rpms, appropriate rpm and '
'rpmbuild binaries are required', exit=True)