From f697957b0cdcdaca9e3c623fe9ffd4131ba75f12 Mon Sep 17 00:00:00 2001
From: Ben Brown <ben.brown@codethink.co.uk>
Date: Fri, 9 Feb 2018 12:49:45 +0000
Subject: Improve error message on missing rpm/rpmbuild binaries

---
 ybd/rpm.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ybd/rpm.py b/ybd/rpm.py
index 6764e49..d24827b 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -566,8 +566,13 @@ def package_rpms(system, whitelist=None):
 
         # Fail now if missing `rpm` or `rpmbuild`
         env_vars = sandbox.env_vars_for_build(system)
-        sandbox.run_sandboxed(system, 'rpm --version', env_vars)
-        sandbox.run_sandboxed(system, 'rpmbuild --version', env_vars)
+        test_cmds = ['rpm --version', 'rpmbuild --version']
+        for cmd in test_cmds:
+            error = sandbox.run_sandboxed(
+                system, cmd, env_vars, exit_on_error=False)
+            if error:
+                log('RPM-BUILD', 'To generate rpms, appropriate rpm and '
+                    'rpmbuild binaries are required', exit=True)
 
         # First initialize the db
         rpmdb_path = os.path.join(system['sandbox'], 'var', 'lib', 'rpm')
-- 
cgit v1.2.1