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

fix product -> release namespace change for productmd

This commit is contained in:
Adam Miller 2015-06-05 17:04:24 -05:00
parent 8d50f89e6e
commit 989b018090
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pungi/metadata.py
View File

@ -91,10 +91,10 @@ def write_tree_info(compose, arch, variant, timestamp=None):
# product # product
# TODO: read from variants.xml # TODO: read from variants.xml
ti.product.name = variant.product_name ti.release.name = variant.product_name
ti.product.version = variant.product_version ti.release.version = variant.product_version
ti.product.short = variant.product_short ti.release.short = variant.product_short
ti.product.is_layered = True ti.release.is_layered = True
# base product # base product
ti.base_product.name = compose.conf["product_name"] ti.base_product.name = compose.conf["product_name"]
@ -106,13 +106,13 @@ def write_tree_info(compose, arch, variant, timestamp=None):
ti.base_product.short = compose.conf["product_short"] ti.base_product.short = compose.conf["product_short"]
else: else:
# product # product
ti.product.name = compose.conf["product_name"] ti.release.name = compose.conf["product_name"]
ti.product.version = compose.conf["product_version"] ti.release.version = compose.conf["product_version"]
ti.product.short = compose.conf["product_short"] ti.release.short = compose.conf["product_short"]
ti.product.is_layered = compose.conf.get("product_is_layered", False) ti.release.is_layered = compose.conf.get("product_is_layered", False)
# base product # base product
if ti.product.is_layered: if ti.release.is_layered:
ti.base_product.name = compose.conf["base_product_name"] ti.base_product.name = compose.conf["base_product_name"]
ti.base_product.version = compose.conf["base_product_version"] ti.base_product.version = compose.conf["base_product_version"]
ti.base_product.short = compose.conf["base_product_short"] ti.base_product.short = compose.conf["base_product_short"]
@ -158,7 +158,7 @@ def write_tree_info(compose, arch, variant, timestamp=None):
repomd_path = os.path.join(addon.repository, "repodata", "repomd.xml") repomd_path = os.path.join(addon.repository, "repodata", "repomd.xml")
ti.checksums.add(os_tree, repomd_path) ti.checksums.add(os_tree, repomd_path)
class LoraxProduct(productmd.treeinfo.product.Product): class LoraxProduct(productmd.treeinfo.Release):
def _check_short(self): def _check_short(self):
# HACK: set self.short so .treeinfo produced by lorax can be read # HACK: set self.short so .treeinfo produced by lorax can be read
if not self.short: if not self.short: