From 7eec376c2a0004c2b3a597f7eb22f9c7f6dba992 Mon Sep 17 00:00:00 2001 From: Roman Prilipskii Date: Thu, 14 May 2026 21:45:32 -0400 Subject: [PATCH] CLOS-2598: Remove dead lua_cjson_handle from ClearPackageConflicts The lua-cjson -> lua51-cjson swap on CL7 -> CL8 is now handled by a PES Replaced event in leapp-data (cloudlinux/pes-events.json), which makes DNF remove lua-cjson in the same transaction that installs lua51-cjson. The actor-level file-removal helper was never wired into process() and is no longer needed. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../libraries/clearpackageconflicts.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/libraries/clearpackageconflicts.py b/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/libraries/clearpackageconflicts.py index f872c18947..3d3c9ea313 100644 --- a/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/libraries/clearpackageconflicts.py +++ b/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/libraries/clearpackageconflicts.py @@ -59,25 +59,6 @@ def alt_python37_handle(package_lookup): clear_problem_files(problem_files, problem_dirs) -def lua_cjson_handle(package_lookup): - """ - lua-cjson package is conflicting with the incoming lua-cjson package for EL8. - """ - problem_packages = [ - "lua-cjson" - ] - problem_files = [ - "/usr/lib64/lua/5.1/cjson.so", - "/usr/share/lua/5.1/cjson/tests/bench.lua", - "/usr/share/lua/5.1/cjson/tests/genutf8.pl", - "/usr/share/lua/5.1/cjson/tests/test.lua", - ] - problem_dirs = [] - - if problem_packages_installed(problem_packages, package_lookup): - clear_problem_files(problem_files, problem_dirs) - - def process(): rpm_lookup = set() # Each InstalledRPM is a list of RPM objects.