almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

New config option: product_type (default is 'ga'); Set to 'updates' for updates composes.

Browse Source
This commit is contained in:
Daniel Mach 2015-08-25 08:04:06 -04:00
parent 219af0c904
commit ba9df6dc5e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pungi/compose.py
View File

@ -46,6 +46,7 @@ def get_compose_dir(topdir, conf, compose_type="production", compose_date=None,
ci.release.short = conf["release_short"] ci.release.short = conf["release_short"]
ci.release.version = conf["release_version"] ci.release.version = conf["release_version"]
ci.release.is_layered = bool(conf.get("release_is_layered", False)) 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: if ci.release.is_layered:
ci.base_product.name = conf["base_product_name"] ci.base_product.name = conf["base_product_name"]
ci.base_product.short = conf["base_product_short"] ci.base_product.short = conf["base_product_short"]

4
pungi/metadata.py
View File

@ -77,6 +77,7 @@ def compose_to_composeinfo(compose):
ci.release.version = compose.conf["release_version"] ci.release.version = compose.conf["release_version"]
ci.release.short = compose.conf["release_short"] ci.release.short = compose.conf["release_short"]
ci.release.is_layered = compose.conf.get("release_is_layered", False) ci.release.is_layered = compose.conf.get("release_is_layered", False)
ci.release.type = compose.conf.get("release_type", "ga").lower()
# base product # base product
if ci.release.is_layered: if ci.release.is_layered:
@ -103,6 +104,7 @@ def compose_to_composeinfo(compose):
var.release.short = variant.release_short var.release.short = variant.release_short
var.release.version = variant.release_version var.release.version = variant.release_version
var.release.is_layered = True var.release.is_layered = True
var.release.type = ci.release.type
for arch in variant.arches: for arch in variant.arches:
# paths: binaries # paths: binaries
@ -190,6 +192,7 @@ def write_tree_info(compose, arch, variant, timestamp=None):
ti.release.version = variant.release_version ti.release.version = variant.release_version
ti.release.short = variant.release_short ti.release.short = variant.release_short
ti.release.is_layered = True ti.release.is_layered = True
ti.release.type = compose.conf.get("release_type", "ga").lower()
# base product # base product
ti.base_product.name = compose.conf["release_name"] 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.version = compose.conf["release_version"]
ti.release.short = compose.conf["release_short"] ti.release.short = compose.conf["release_short"]
ti.release.is_layered = compose.conf.get("release_is_layered", False) ti.release.is_layered = compose.conf.get("release_is_layered", False)
ti.release.type = compose.conf.get("release_type", "ga").lower()
# base product # base product
if ti.release.is_layered: if ti.release.is_layered: