almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

pkgset: Stop reuse if configuration changed

Browse Source 
When options controlling excluding arches change, it should break reuse.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
(cherry picked from commit a71c8e23be)
This commit is contained in:
Lubomír Sedlář 2022-09-23 10:14:12 +02:00 committed by Stepan Oksanichenko
parent 4cb8671fe4
commit 48366177cc
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pungi/phases/pkgset/pkgsets.py
View File

@ -739,6 +739,12 @@ class KojiPackageSet(PackageSetBase):
"srpms_by_name": self.srpms_by_name, "srpms_by_name": self.srpms_by_name,
"extra_builds": self.extra_builds, "extra_builds": self.extra_builds,
"include_packages": include_packages, "include_packages": include_packages,
"inherit_to_noarch": compose.conf[
"pkgset_inherit_exclusive_arch_to_noarch"
],
"exclusive_noarch": compose.conf[
"pkgset_exclusive_arch_considers_noarch"
],
}, },
f, f,
protocol=pickle.HIGHEST_PROTOCOL, protocol=pickle.HIGHEST_PROTOCOL,
@ -833,6 +839,8 @@ class KojiPackageSet(PackageSetBase):
self.log_debug("Failed to load reuse file: %s" % str(e)) self.log_debug("Failed to load reuse file: %s" % str(e))
return False return False
inherit_to_noarch = compose.conf["pkgset_inherit_exclusive_arch_to_noarch"]
exclusive_noarch = compose.conf["pkgset_exclusive_arch_considers_noarch"]
if ( if (
reuse_data["allow_invalid_sigkeys"] == self._allow_invalid_sigkeys reuse_data["allow_invalid_sigkeys"] == self._allow_invalid_sigkeys
and reuse_data["packages"] == self.packages and reuse_data["packages"] == self.packages
@ -840,6 +848,10 @@ class KojiPackageSet(PackageSetBase):
and reuse_data["extra_builds"] == self.extra_builds and reuse_data["extra_builds"] == self.extra_builds
and reuse_data["sigkeys"] == self.sigkey_ordering and reuse_data["sigkeys"] == self.sigkey_ordering
and reuse_data["include_packages"] == include_packages and reuse_data["include_packages"] == include_packages
# If the value is not present in reuse data, the compose was
# generated with older version of Pungi. Best to not reuse.
and reuse_data.get("inherit_to_noarch") == inherit_to_noarch
and reuse_data.get("exclusive_noarch") == exclusive_noarch
): ):
self.log_info("Copying repo data for reuse: %s" % old_repo_dir) self.log_info("Copying repo data for reuse: %s" % old_repo_dir)
copy_all(old_repo_dir, repo_dir) copy_all(old_repo_dir, repo_dir)

2
tests/test_pkgset_pkgsets.py
View File

@ -1100,6 +1100,8 @@ class TestReuseKojiMockPkgset(helpers.PungiTestCase):
"include_packages": None, "include_packages": None,
"rpms_by_arch": mock.Mock(), "rpms_by_arch": mock.Mock(),
"srpms_by_name": mock.Mock(), "srpms_by_name": mock.Mock(),
"exclusive_noarch": True,
"inherit_to_noarch": True,
} }
) )
self.pkgset.old_file_cache = mock.Mock() self.pkgset.old_file_cache = mock.Mock()