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

fixup productmd imports for changes with open sourcing 

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2015-04-24 17:55:56 -05:00
parent f828850466
commit 771ed2efcb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pungi/compose.py
View File

@ -27,7 +27,8 @@ import tempfile
import shutil import shutil
import kobo.log import kobo.log
from productmd import ComposeInfo, ImageManifest from productmd.composeinfo import Compose
from productmd.images import Images
from pungi.wrappers.variants import VariantsXmlParser from pungi.wrappers.variants import VariantsXmlParser
from pungi.paths import Paths from pungi.paths import Paths
@ -40,8 +41,8 @@ def get_compose_dir(topdir, conf, compose_type="production", compose_date=None,
topdir = os.path.abspath(topdir) topdir = os.path.abspath(topdir)
already_exists_callbacks = already_exists_callbacks or [] already_exists_callbacks = already_exists_callbacks or []
# create an incomplete ComposeInfo to generate compose ID # create an incomplete composeinfo to generate compose ID
ci = ComposeInfo() ci = Compose()
ci.product.name = conf["product_name"] ci.product.name = conf["product_name"]
ci.product.short = conf["product_short"] ci.product.short = conf["product_short"]
ci.product.version = conf["product_version"] ci.product.version = conf["product_version"]
@ -112,7 +113,7 @@ class Compose(kobo.log.LoggingBase):
self.paths = Paths(self) self.paths = Paths(self)
# to provide compose_id, compose_date and compose_respin # to provide compose_id, compose_date and compose_respin
self.ci_base = ComposeInfo() self.ci_base = Compose()
self.ci_base.load(os.path.join(self.paths.work.topdir(arch="global"), "composeinfo-base.json")) self.ci_base.load(os.path.join(self.paths.work.topdir(arch="global"), "composeinfo-base.json"))
self.supported = supported self.supported = supported

1
pungi/metadata.py
View File

@ -20,7 +20,6 @@ import time
import productmd.composeinfo import productmd.composeinfo
import productmd.treeinfo import productmd.treeinfo
import productmd.treeinfo.product
from productmd.common import get_major_version from productmd.common import get_major_version
from kobo.shortcuts import relative_path from kobo.shortcuts import relative_path