Only write sub-package 'vendor' tags if explicitly setjjardon/vendor-in-all-packages

Sub-packages will inherit from the top level declaration.

1 files changed, 2 insertions, 4 deletions

diff --git a/ybd/rpm.py b/ybd/rpm.py
index e04b6e7..b63c5df 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -187,10 +187,8 @@ def generate_spec(dn, stage_dir, metafile, output, name, system):
                 # Sub-Package header
                 output_f.write('%%package -n %s\n' % package['name'])
                 output_f.write('Summary: %s\n' % description)
-                vendor = next((d['vendor'] for d in (package, rpm_metadata)
-                               if 'vendor' in d), None)
-                if vendor:
-                    output_f.write('Vendor: %s\n' % vendor)
+                if 'vendor' in package:
+                    output_f.write('Vendor: %s\n' % package['vendor'])
                 if 'version' in package:
                     output_f.write('Version: %s\n' % package['version'])
                 if 'release' in package: