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

Merge #357 Improve error messages for gathering packages

Browse Source
This commit is contained in:
Dennis Gilmore 2016-08-10 11:36:18 +00:00
commit 6a682f64fe
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pungi/phases/gather/__init__.py
View File

@ -425,7 +425,9 @@ def get_prepopulate_packages(compose, arch, variant):
for i in packages: for i in packages:
pkg_name, pkg_arch = split_name_arch(i) pkg_name, pkg_arch = split_name_arch(i)
if pkg_arch not in get_compatible_arches(arch, multilib=True): if pkg_arch not in get_compatible_arches(arch, multilib=True):
raise ValueError("Incompatible package arch '%s' for tree arch '%s'" % (pkg_arch, arch)) raise ValueError(
"Incompatible package arch '%s' for tree arch '%s' in prepopulate package '%s'"
% (pkg_arch, arch, pkg_name))
result.add(i) result.add(i)
return result return result
@ -435,7 +437,9 @@ def get_additional_packages(compose, arch, variant):
for i in get_arch_variant_data(compose.conf, "additional_packages", arch, variant): for i in get_arch_variant_data(compose.conf, "additional_packages", arch, variant):
pkg_name, pkg_arch = split_name_arch(i) pkg_name, pkg_arch = split_name_arch(i)
if pkg_arch is not None and pkg_arch not in get_compatible_arches(arch, multilib=True): if pkg_arch is not None and pkg_arch not in get_compatible_arches(arch, multilib=True):
raise ValueError("Incompatible package arch '%s' for tree arch '%s'" % (pkg_arch, arch)) raise ValueError(
"Incompatible package arch '%s' for tree arch '%s' in additional package '%s'"
% (pkg_arch, arch, pkg_name))
result.add((pkg_name, pkg_arch)) result.add((pkg_name, pkg_arch))
return result return result