summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2017-01-26 15:57:53 +0000
committerJavier Jardón <jjardon@gnome.org>2017-05-11 08:24:19 +0000
commitc0721b6254f1e2561b1b066786697520d0539fbe (patch)
treec87c6256a7ccce530293d3e88c33f39a8a4f5d86
parent74b01ff32958a58648450487ec1aab3dc340ddd5 (diff)
downloadybd-c0721b6254f1e2561b1b066786697520d0539fbe.tar.gz
Make RPM generation dependent on config
It should only generate RPMs if 'generate-rpms' is true.
-rwxr-xr-xybd/__main__.py3
-rw-r--r--ybd/config/ybd.conf3
2 files changed, 5 insertions, 1 deletions
diff --git a/ybd/__main__.py b/ybd/__main__.py
index 1f54320..e86b75c 100755
--- a/ybd/__main__.py
+++ b/ybd/__main__.py
@@ -123,7 +123,8 @@ with timer('TOTAL'):
log(target, 'Exiting: uncaught exception')
os._exit(1)
- package_rpms(target)
+ if config.get('generate-rpms', False) is True:
+ package_rpms(target)
if config.get('reproduce'):
log('REPRODUCED',
diff --git a/ybd/config/ybd.conf b/ybd/config/ybd.conf
index cb23b1d..8c93f1a 100644
--- a/ybd/config/ybd.conf
+++ b/ybd/config/ybd.conf
@@ -216,3 +216,6 @@ tar-url: 'http://git.baserock.org/tarballs'
# Trove has an api to describe a tree for a commit
tree-server: 'http://git.baserock.org:8080/1.0/sha1s?'
+# With generate-rpms enabled, when ybd builds a system that contains rpm, it
+# can produce rpms and store them in the "deployment" subdirectory.
+generate-rpms: False