From 55c885ce7fbf5fd237047d4f1d8e66a043e3a1b3 Mon Sep 17 00:00:00 2001 From: Matej Matuska Date: Fri, 11 Jul 2025 14:32:57 +0200 Subject: [PATCH 52/66] Fix: skip checking ownership of files in .../directory-hash/ dir This check has been reintroduced in 87013d25b5aa3, however the "root" directory during traversal is: /var/lib/leapp/el10userspace/etc/pki/ca-trust/extracted/pem/directory-hash. The skip condition looks for '/directory-hash/' which is false. --- .../actors/targetuserspacecreator/libraries/userspacegen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py index 9fc96a52..cbad91fe 100644 --- a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py +++ b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py @@ -311,7 +311,7 @@ def _get_files_owned_by_rpms(context, dirpath, pkgs=None, recursive=False): searchdir = context.full_path(dirpath) if recursive: for root, _, files in os.walk(searchdir): - if '/directory-hash/' in root: + if '/directory-hash' in root: # tl;dr; for the performance improvement # The directory has been relatively recently added to ca-certificates # rpm on EL 9+ systems and the content does not seem to be important -- 2.50.1