From 8c0b99e536b52519277a50444bf67f4444ec69f7 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Tue, 13 Aug 2024 23:30:42 +0200 Subject: [PATCH] targetuserspacecreator: stop skipping `directory-hash` (#1278) Reverting commit 60f500e59bb92fa80a032f663ee889624fa4a95d The original commit only workarounded the root cause - leaked file descriptors in the leapp stdlib when using the `run` function. Dropping the change in the actor as it is not needed anymore. relates: https://github.com/oamg/leapp/pull/880 (cherry picked from commit 24700ee42fe7605d7c8a87f60134122a1218ead3) --- .../actors/targetuserspacecreator/libraries/userspacegen.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py index 261609fd56..ae5bdca595 100644 --- a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py +++ b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py @@ -314,10 +314,6 @@ def _get_files_owned_by_rpms(context, dirpath, pkgs=None, recursive=False): for root, _, files in os.walk(searchdir): for filename in files: relpath = os.path.relpath(os.path.join(root, filename), searchdir) - # "directory-hash" files are not owned by any package and can dynamically - # grow to a huge amount of files causing hitting open files limit - if 'directory-hash' in relpath: - continue file_list.append(relpath) else: file_list = os.listdir(searchdir)