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

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +29 -10
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da336f75f8 - Show all commits

13
pungi/phases/buildinstall.py
View File

@ -669,9 +669,16 @@ class BuildinstallThread(WorkerThread):
return None return None
compose.log_info("Loading old BUILDINSTALL phase metadata: %s", old_metadata) compose.log_info("Loading old BUILDINSTALL phase metadata: %s", old_metadata)
with open(old_metadata, "rb") as f: try:
old_result = pickle.load(f) with open(old_metadata, "rb") as f:
return old_result old_result = pickle.load(f)
return old_result
except Exception as e:
compose.log_debug(
"Failed to load old BUILDINSTALL phase metadata %s : %s"
% (old_metadata, str(e))
)
return None
def _reuse_old_buildinstall_result(self, compose, arch, variant, cmd, pkgset_phase): def _reuse_old_buildinstall_result(self, compose, arch, variant, cmd, pkgset_phase):
""" """

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

@ -193,9 +193,16 @@ def load_old_gather_result(compose, arch, variant):
return None return None
compose.log_info("Loading old GATHER phase results: %s", old_gather_result) compose.log_info("Loading old GATHER phase results: %s", old_gather_result)
with open(old_gather_result, "rb") as f: try:
old_result = pickle.load(f) with open(old_gather_result, "rb") as f:
return old_result old_result = pickle.load(f)
return old_result
except Exception as e:
compose.log_debug(
"Failed to load old GATHER phase results %s : %s"
% (old_gather_result, str(e))
)
return None
def reuse_old_gather_packages(compose, arch, variant, package_sets, methods): def reuse_old_gather_packages(compose, arch, variant, package_sets, methods):

13
pungi/phases/pkgset/sources/source_koji.py
View File

@ -819,11 +819,16 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
compose.paths.work.pkgset_file_cache(compose_tag) compose.paths.work.pkgset_file_cache(compose_tag)
) )
if old_cache_path: if old_cache_path:
pkgset.set_old_file_cache( try:
pungi.phases.pkgset.pkgsets.KojiPackageSet.load_old_file_cache( pkgset.set_old_file_cache(
old_cache_path pungi.phases.pkgset.pkgsets.KojiPackageSet.load_old_file_cache(
old_cache_path
)
)
except Exception as e:
compose.log_debug(
"Failed to load old cache file %s : %s" % (old_cache_path, str(e))
) )
)
is_traditional = compose_tag in compose.conf.get("pkgset_koji_tag", []) is_traditional = compose_tag in compose.conf.get("pkgset_koji_tag", [])
should_inherit = inherit if is_traditional else inherit_modules should_inherit = inherit if is_traditional else inherit_modules