Skip to content

Commit 4e91b1f

Browse files
committed
Fix review concerns
1 parent 7e13755 commit 4e91b1f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

repos/system_upgrade/cloudlinux/actors/clmysqlrepositorysetup/libraries/clmysqlrepositorysetup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def _make_upgrade_mariadb_url(self, mariadb_url, source_major, target_major):
195195
# Replace the first occurrence of source_major with target_major after 'yum'
196196
url_parts = mariadb_url.split("yum", 1)
197197
if len(url_parts) == 2:
198-
# Replace major version in "/centos/7/" and /yum/12.0/almalinux9-amd64/,
198+
# Replace major version in "/centos/7/" and /12.0/almalinux9-amd64/,
199199
# but do not replace it in /mariadb-10.7/yum/
200200
url_parts[1] = url_parts[1].replace("/{}/".format(source_major), "/{}/".format(target_major))
201201
url_parts[1] = url_parts[1].replace("{}-".format(source_major), "{}-".format(target_major))
@@ -204,7 +204,6 @@ def _make_upgrade_mariadb_url(self, mariadb_url, source_major, target_major):
204204
url_parts[1] = url_parts[1].replace('$releasever', str(target_major))
205205
return "yum".join(url_parts)
206206
else:
207-
# TODO: fix in https://cloudlinux.atlassian.net/browse/CLOS-3490
208207
api.current_logger().warning("Unsupported repository URL={}, skipping".format(mariadb_url))
209208
return
210209

@@ -230,7 +229,7 @@ def mariadb_process(self, repofile_name, repofile_data):
230229
[
231230
reporting.Title("MariaDB version is not compatible with Leapp upgrade"),
232231
reporting.Summary(
233-
"MariaDB is installed on this system but is's version is not compatible with Leapp upgrade process. "
232+
"MariaDB is installed on this system but its version is not compatible with Leapp upgrade process. "
234233
"The upgrade is blocked to prevent system instability. "
235234
"This situation cannot be automatically resolved by Leapp. "
236235
"Problematic repository: {0}".format(target_repo.repoid)

0 commit comments

Comments
 (0)