From 7fc5883801eee0a1b2539825ff12d6583e23a8ae Mon Sep 17 00:00:00 2001 From: Umit Kablan Date: Wed, 12 Aug 2026 10:47:15 +0300 Subject: [PATCH] BUGFIX Assert configuration files conflicts are resolved --- cloudlinux7to8/upgrader.py | 1 + dist-upgrader | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cloudlinux7to8/upgrader.py b/cloudlinux7to8/upgrader.py index 69c9f7d..016c00c 100644 --- a/cloudlinux7to8/upgrader.py +++ b/cloudlinux7to8/upgrader.py @@ -270,6 +270,7 @@ def get_check_actions( custom_actions.AssertLastInstalledKernelInUse(), custom_actions.AssertLocalRepositoryNotPresent(), custom_actions.AssertNoRepositoryDuplicates(), + common_actions.AssertConfigurationConflictsResolved(["/etc/my.cnf"]), custom_actions.AssertMariadbRepoAvailable(), custom_actions.AssertModernPostgresRepositoryFilePresent(), common_actions.AssertNotInContainer(), diff --git a/dist-upgrader b/dist-upgrader index ac30384..d99de3c 160000 --- a/dist-upgrader +++ b/dist-upgrader @@ -1 +1 @@ -Subproject commit ac30384fc3367810029d097db0c3557e7fc83c61 +Subproject commit d99de3cf4294354c060380787d6de20e6878677d