Class failure to generate a spec as failure if rpm-metadata is definedtristan/rpm-export-rebase

1 files changed, 4 insertions, 2 deletions

diff --git a/ybd/rpm.py b/ybd/rpm.py
index 4165903..f122558 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -110,8 +110,6 @@ def is_main_package(system, dn, package):
 
 
 def generate_spec(dn, stage_dir, metafile, output, name, system):
-    if 'rpm-metadata' not in dn:
-        return False
     if 'version' not in dn['rpm-metadata']:
         app.log(dn, "Cannot generate spec, no version is defined!")
         return False
@@ -260,6 +258,9 @@ def package_one_rpm(dn, userdata):
             specfile = os.path.join(metadir, '%s.spec' % name)
             success = True
 
+            if 'rpm-metadata' not in dn:
+                # No metadata defined for rpm generation, pass.
+                return success
             if generate_spec(dn, fulldir, metafile, specfile,
                              name, system):
                 defines = extract_defines(dn)
@@ -277,6 +278,7 @@ def package_one_rpm(dn, userdata):
                 success, _, _ = sandbox.run_sandboxed(
                     system, command, env_vars, exit_on_error=False)
             else:
+                success = False
                 app.log(dn, "Failed to generate spec, not generating rpm")
 
             if success: