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

[extra-files] Refactoring

Browse Source 
* remove duplicated function arguments
 * move logic into smaller and well documented functions

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-05-12 13:56:55 +02:00
parent 74001d5aa5
commit 170cd8f72d
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pungi/phases/extra_files.py
View File

@ -58,7 +58,6 @@ def copy_extra_files(compose, arch, variant, package_sets):
} }
msg = "Getting extra files (arch: %s, variant: %s)" % (arch, variant) msg = "Getting extra files (arch: %s, variant: %s)" % (arch, variant)
# no skip (yet?)
compose.log_info("[BEGIN] %s" % msg) compose.log_info("[BEGIN] %s" % msg)
os_tree = compose.paths.compose.os_tree(arch, variant) os_tree = compose.paths.compose.os_tree(arch, variant)
@ -66,24 +65,37 @@ def copy_extra_files(compose, arch, variant, package_sets):
for scm_dict in get_arch_variant_data(compose.conf, "extra_files", arch, variant): for scm_dict in get_arch_variant_data(compose.conf, "extra_files", arch, variant):
scm_dict = copy.deepcopy(scm_dict) scm_dict = copy.deepcopy(scm_dict)
# if scm is "rpm" and repo contains a package name, find the package(s) in package set # if scm is "rpm" and repo contains only a package name, find the
if scm_dict["scm"] == "rpm" and not (scm_dict["repo"].startswith("/") or "://" in scm_dict["repo"]): # package(s) in package set
if scm_dict["scm"] == "rpm" and not _is_external(scm_dict["repo"]):
rpms = [] rpms = []
for pkgset_file in package_sets[arch]: for pkgset_file in package_sets[arch]:
pkg_obj = package_sets[arch][pkgset_file] pkg_obj = package_sets[arch][pkgset_file]
if not pkg_is_rpm(pkg_obj): if not pkg_is_rpm(pkg_obj):
continue continue
pkg_name, pkg_arch = split_name_arch(scm_dict["repo"] % var_dict) pkg_name, pkg_arch = split_name_arch(scm_dict["repo"] % var_dict)
if fnmatch.fnmatch(pkg_obj.name, pkg_name) and pkg_arch is None or pkg_arch == pkg_obj.arch: if _pkg_matches(pkg_obj, pkg_name, pkg_arch):
rpms.append(pkg_obj.file_path) rpms.append(pkg_obj.file_path)
scm_dict["repo"] = rpms scm_dict["repo"] = rpms
if "file" in scm_dict: getter = get_file_from_scm if 'file' in scm_dict else get_dir_from_scm
get_file_from_scm(scm_dict, os.path.join(extra_files_dir, scm_dict.get("target", "").lstrip("/")), logger=compose._logger) getter(scm_dict,
else: os.path.join(extra_files_dir, scm_dict.get('target', '').lstrip('/')),
get_dir_from_scm(scm_dict, os.path.join(extra_files_dir, scm_dict.get("target", "").lstrip("/")), logger=compose._logger) logger=compose._logger)
if os.listdir(extra_files_dir): if os.listdir(extra_files_dir):
copy_all(extra_files_dir, os_tree) copy_all(extra_files_dir, os_tree)
compose.log_info("[DONE ] %s" % msg) compose.log_info("[DONE ] %s" % msg)
def _pkg_matches(pkg_obj, name_glob, arch):
"""Check if `pkg_obj` matches name and arch."""
return (fnmatch.fnmatch(pkg_obj.name, name_glob) and
(arch is None or arch == pkg_obj.arch))
def _is_external(rpm):
"""Check if path to rpm points outside of the compose: i.e. it is an
absolute path or a URL."""
return rpm.startswith('/') or '://' in rpm