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

update for new productmd named args to rpms

Browse Source
This commit is contained in:
Adam Miller 2015-06-05 16:19:17 -05:00
parent dc9cfffbb9
commit 654ac5fbaa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pungi/phases/gather/link.py
View File

@ -62,7 +62,7 @@ def link_files(compose, arch, variant, pkg_map, pkg_sets, manifest, srpm_map={})
# update rpm manifest # update rpm manifest
pkg_obj = pkg_set[pkg["path"]] pkg_obj = pkg_set[pkg["path"]]
nevra = pkg_obj.nevra nevra = pkg_obj.nevra
manifest.add("src", variant.uid, nevra, path=dst_relpath, sigkey=pkg_obj.signature, rpm_type="source") manifest.add("src", variant.uid, nevra, path=dst_relpath, sigkey=pkg_obj.signature, category="source")
# update srpm_map # update srpm_map
srpm_map.setdefault(pkg_obj.file_name, nevra) srpm_map.setdefault(pkg_obj.file_name, nevra)
@ -80,7 +80,7 @@ def link_files(compose, arch, variant, pkg_map, pkg_sets, manifest, srpm_map={})
pkg_obj = pkg_set[pkg["path"]] pkg_obj = pkg_set[pkg["path"]]
nevra = pkg_obj.nevra nevra = pkg_obj.nevra
src_nevra = _get_src_nevra(compose, pkg_obj, srpm_map) src_nevra = _get_src_nevra(compose, pkg_obj, srpm_map)
manifest.add(arch, variant.uid, nevra, path=dst_relpath, sigkey=pkg_obj.signature, rpm_type="package", srpm_nevra=src_nevra) manifest.add(arch, variant.uid, nevra, path=dst_relpath, sigkey=pkg_obj.signature, category="binary", srpm_nevra=src_nevra)
packages_dir = compose.paths.compose.debug_packages(arch, variant) packages_dir = compose.paths.compose.debug_packages(arch, variant)
packages_dir_relpath = compose.paths.compose.debug_packages(arch, variant, relative=True) packages_dir_relpath = compose.paths.compose.debug_packages(arch, variant, relative=True)
@ -95,7 +95,7 @@ def link_files(compose, arch, variant, pkg_map, pkg_sets, manifest, srpm_map={})
pkg_obj = pkg_set[pkg["path"]] pkg_obj = pkg_set[pkg["path"]]
nevra = pkg_obj.nevra nevra = pkg_obj.nevra
src_nevra = _get_src_nevra(compose, pkg_obj, srpm_map) src_nevra = _get_src_nevra(compose, pkg_obj, srpm_map)
manifest.add(arch, variant.uid, nevra, path=dst_relpath, sigkey=pkg_obj.signature, rpm_type="debug", srpm_nevra=src_nevra) manifest.add(arch, variant.uid, nevra, path=dst_relpath, sigkey=pkg_obj.signature, category="debug", srpm_nevra=src_nevra)
pool.start() pool.start()
pool.stop() pool.stop()