From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 10 Jun 2022 14:46:25 +0000 (+0200)
Subject: mkosi: when cleaning rpm data, also nuke /usr/lib/sysimage/rpm
X-Git-Tag: v13~5^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e393067518663bd8a0261222e4bdc7c1c2c25182;p=thirdparty%2Fmkosi.git

mkosi: when cleaning rpm data, also nuke /usr/lib/sysimage/rpm

F36 moved rpm db there. SUSE has been using this location for a while.
So our cleaning of rpm data wasn't effective.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index c47b718a6..6e6143c22 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1999,6 +1999,7 @@ def clean_rpm_metadata(root: Path, always: bool) -> None:
     """Remove rpm metadata if /bin/rpm is not present in the image"""
     paths = [
         "/var/lib/rpm",
+        "/usr/lib/sysimage/rpm",
     ]
 
     clean_paths(root, paths, tool='/bin/rpm', always=always)