From ba9df6dc5eb66cb3b3f1cb23ac88631d937ddca9 Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Tue, 25 Aug 2015 08:04:06 -0400 Subject: [PATCH] New config option: product_type (default is 'ga'); Set to 'updates' for updates composes. --- pungi/compose.py | 1 + pungi/metadata.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/pungi/compose.py b/pungi/compose.py index bb6b77ab..aebf241c 100644 --- a/pungi/compose.py +++ b/pungi/compose.py @@ -46,6 +46,7 @@ def get_compose_dir(topdir, conf, compose_type="production", compose_date=None, ci.release.short = conf["release_short"] ci.release.version = conf["release_version"] ci.release.is_layered = bool(conf.get("release_is_layered", False)) + ci.release.type = conf.get("release_type", "ga").lower() if ci.release.is_layered: ci.base_product.name = conf["base_product_name"] ci.base_product.short = conf["base_product_short"] diff --git a/pungi/metadata.py b/pungi/metadata.py index 2982029d..45e9e112 100644 --- a/pungi/metadata.py +++ b/pungi/metadata.py @@ -77,6 +77,7 @@ def compose_to_composeinfo(compose): ci.release.version = compose.conf["release_version"] ci.release.short = compose.conf["release_short"] ci.release.is_layered = compose.conf.get("release_is_layered", False) + ci.release.type = compose.conf.get("release_type", "ga").lower() # base product if ci.release.is_layered: @@ -103,6 +104,7 @@ def compose_to_composeinfo(compose): var.release.short = variant.release_short var.release.version = variant.release_version var.release.is_layered = True + var.release.type = ci.release.type for arch in variant.arches: # paths: binaries @@ -190,6 +192,7 @@ def write_tree_info(compose, arch, variant, timestamp=None): ti.release.version = variant.release_version ti.release.short = variant.release_short ti.release.is_layered = True + ti.release.type = compose.conf.get("release_type", "ga").lower() # base product ti.base_product.name = compose.conf["release_name"] @@ -205,6 +208,7 @@ def write_tree_info(compose, arch, variant, timestamp=None): ti.release.version = compose.conf["release_version"] ti.release.short = compose.conf["release_short"] ti.release.is_layered = compose.conf.get("release_is_layered", False) + ti.release.type = compose.conf.get("release_type", "ga").lower() # base product if ti.release.is_layered: