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

Merge #432 metadata: Correctly clone buildinstall .treeinfo

Browse Source
This commit is contained in:
Dennis Gilmore 2016-10-19 16:36:45 +00:00
commit 2f184f9b23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pungi/metadata.py
View File

@ -279,7 +279,15 @@ def write_tree_info(compose, arch, variant, timestamp=None):
os_tree = compose.paths.compose.os_tree(arch, variant) os_tree = compose.paths.compose.os_tree(arch, variant)
# clone all but 'general' sections from buildinstall .treeinfo # clone all but 'general' sections from buildinstall .treeinfo
bi_treeinfo = os.path.join(compose.paths.work.buildinstall_dir(arch), variant.uid, ".treeinfo")
bi_dir = compose.paths.work.buildinstall_dir(arch)
if compose.conf['buildinstall_method'] == 'lorax':
# The .treeinfo file produced by lorax is nested in variant
# subdirectory. Legacy buildinstall runs once per arch, so there is
# only one file.
bi_dir = os.path.join(bi_dir, variant.uid)
bi_treeinfo = os.path.join(bi_dir, ".treeinfo")
if os.path.exists(bi_treeinfo): if os.path.exists(bi_treeinfo):
bi_ti = LoraxTreeInfo() bi_ti = LoraxTreeInfo()
bi_ti.load(bi_treeinfo) bi_ti.load(bi_treeinfo)