summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2017-04-03 10:14:24 +0100
committerJavier Jardón <jjardon@gnome.org>2017-04-07 10:06:15 +0000
commitb77b3aa725e5cf576ab5a6933c1611711d8b04c1 (patch)
tree0bdc70275f68cc8e7b958bc821205d4061da959e
parente6b54b48250058e33150a4fe29029c92ea6b62ca (diff)
downloadybd-b77b3aa725e5cf576ab5a6933c1611711d8b04c1.tar.gz
rpm: Fix provides not being set for main package sometimes
Specifically, when package names are identified by way of macros.
-rw-r--r--ybd/rpm.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ybd/rpm.py b/ybd/rpm.py
index 458a4db..31a8c9e 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -136,9 +136,10 @@ def generate_spec(dn, stage_dir, metafile, output, name, time, system):
output_f.write('Prefix: %s\n' % dn.get('prefix', '/usr'))
# Add all the main package Provides:
for package in package_list:
- if package['name'] == name and 'provides' in package:
- for provide in package['provides']:
- output_f.write('Provides: %s\n' % provide)
+ if is_main_package(system, dn, package['name']):
+ if 'provides' in package:
+ for provide in package['provides']:
+ output_f.write('Provides: %s\n' % provide)
output_f.write('\n')
output_f.write('%%description\n')