From 0ef1c102b8f9dde8b374d6db1badde995b6808a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 12 Feb 2024 14:29:03 +0100 Subject: [PATCH] Block pkgset reuse on module defaults change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JIRA: RHELCMP-13463 Signed-off-by: Lubomír Sedlář --- pungi/phases/pkgset/pkgsets.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pungi/phases/pkgset/pkgsets.py b/pungi/phases/pkgset/pkgsets.py index 3cc68f25..81c090c6 100644 --- a/pungi/phases/pkgset/pkgsets.py +++ b/pungi/phases/pkgset/pkgsets.py @@ -761,6 +761,7 @@ class KojiPackageSet(PackageSetBase): "exclusive_noarch": compose.conf[ "pkgset_exclusive_arch_considers_noarch" ], + "module_defaults_dir": compose.conf.get("module_defaults_dir"), }, f, protocol=pickle.HIGHEST_PROTOCOL, @@ -857,6 +858,7 @@ class KojiPackageSet(PackageSetBase): inherit_to_noarch = compose.conf["pkgset_inherit_exclusive_arch_to_noarch"] exclusive_noarch = compose.conf["pkgset_exclusive_arch_considers_noarch"] + module_defaults_dir = compose.conf.get("module_defaults_dir") if ( reuse_data["allow_invalid_sigkeys"] == self._allow_invalid_sigkeys and reuse_data["packages"] == self.packages @@ -868,6 +870,7 @@ class KojiPackageSet(PackageSetBase): # 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 + and reuse_data.get("module_defaults_dir") == module_defaults_dir ): self.log_info("Copying repo data for reuse: %s" % old_repo_dir) copy_all(old_repo_dir, repo_dir)