From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 19 Feb 2024 13:00:34 +0000 (+0100)
Subject: centos: Fix condition for using /usr/lib/sysimage/rpm with hyperscale
X-Git-Tag: v21~44^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2402%2Fhead;p=thirdparty%2Fmkosi.git

centos: Fix condition for using /usr/lib/sysimage/rpm with hyperscale
---

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index b065ae917..d98b6ebed 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -58,10 +58,11 @@ class Installer(DistributionInstaller):
         if GenericVersion(context.config.release) < 9:
             return "/var/lib/rpm"
 
-        # The Hyperscale SIG uses /usr/lib/sysimage/rpm from C9S onwards already.
+        # The Hyperscale SIG uses /usr/lib/sysimage/rpm in its rebuild of rpm for C9S that's shipped in the
+        # hyperscale-packages-experimental repository.
         if (
             GenericVersion(context.config.release) == 9 and
-            not any("hyperscale" in repo for repo in context.config.repositories)
+            "hyperscale-packages-experimental" not in context.config.repositories
         ):
             return "/var/lib/rpm"