Merge branch 'benbrown/epoch' into 'master'

Support epoch field in definitions

See merge request !380

1 files changed, 6 insertions, 0 deletions

diff --git a/ybd/rpm.py b/ybd/rpm.py
index 70a6d15..8309a47 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -161,6 +161,10 @@ def generate_spec(dn, stage_dir, metafile, output, name, system):
                 else:
                     app.log(dn, "Main package has no release!")
                     return False
+                epoch = next((d['epoch'] for d in (package, rpm_metadata)
+                              if 'epoch' in d), None)
+                if epoch:
+                    output_f.write('Epoch: %s\n' % epoch)
                 if 'provides' in package:
                     for provide in package['provides']:
                         output_f.write('Provides: %s\n' % provide)
@@ -183,6 +187,8 @@ def generate_spec(dn, stage_dir, metafile, output, name, system):
                 if 'release' in package:
                     output_f.write('Release: {}git{}\n'
                                    .format(package['release'], dn['sha']))
+                if 'epoch' in package:
+                    output_f.write('Epoch: %s\n' % package['epoch'])
                 if 'provides' in package:
                     for provide in package['provides']:
                         output_f.write('Provides: %s\n' % provide)