From acaed7edcea66f2cef9aabc148a431825f91479e Mon Sep 17 00:00:00 2001 From: Matej Matuska Date: Fri, 11 Jul 2025 18:17:51 +0200 Subject: [PATCH 53/66] fixup! Fix: skip checking ownership of files in .../directory-hash/ dir --- .../actors/targetuserspacecreator/libraries/userspacegen.py | 4 +++- 1 file changed, 3 insertions(+), 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 cbad91fe..699f1517 100644 --- a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py +++ b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py @@ -294,6 +294,8 @@ def _get_files_owned_by_rpms(context, dirpath, pkgs=None, recursive=False): """ Return the list of file names inside dirpath owned by RPMs. + The returned paths are relative to the dirpath. + This is important e.g. in case of RHUI which installs specific repo files in the yum.repos.d directory. @@ -334,7 +336,7 @@ def _get_files_owned_by_rpms(context, dirpath, pkgs=None, recursive=False): api.current_logger().debug('SKIP the {} file: not owned by any rpm'.format(fname)) continue if pkgs and not [pkg for pkg in pkgs if pkg in result['stdout']]: - api.current_logger().debug('SKIP the {} file: not owned by any searched rpm:'.format(fname)) + api.current_logger().debug('SKIP the {} file: not owned by any searched rpm'.format(fname)) continue api.current_logger().debug('Found the file owned by an rpm: {}.'.format(fname)) files_owned_by_rpms.append(fname) -- 2.50.1