Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-06-18 17:01:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflicting MariaDB-server-compat packages before installation

Browse Source 
- Remove MariaDB-server-compat* packages that conflict with MariaDB 10.11
- Fixes transaction test errors when installing MariaDB 10.11
- Removes compat packages from previous MariaDB 12.1 installation attempts
- Ensures clean MariaDB 10.11 installation without conflicts
- Also remove sudo from curl command (not needed when running as root)
This commit is contained in:
master3395
2026-01-26 22:58:06 +01:00
parent e271edd1b2
commit a28c4287bf
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
install/install.py
View File

@@ -349,6 +349,17 @@ class preFlightsChecks:
# This prevents upgrade attempts in Pre_Install_Required_Components
self.disableMariaDB12RepositoryIfNeeded()
# CRITICAL: Remove conflicting MariaDB compat packages before installation
# These packages from MariaDB 12.1 can conflict with MariaDB 10.11
self.stdOut("Removing conflicting MariaDB compat packages...", 1)
try:
# Remove MariaDB-server-compat packages that conflict with MariaDB 10.11
compat_remove_cmd = "dnf remove -y MariaDB-server-compat* 2>/dev/null || rpm -e --nodeps MariaDB-server-compat* 2>/dev/null || true"
subprocess.run(compat_remove_cmd, shell=True, timeout=60)
self.stdOut("Removed conflicting MariaDB compat packages", 1)
except Exception as e:
self.stdOut(f"Warning: Could not remove compat packages: {e}", 0)
# Check if MariaDB is already installed before attempting installation
is_installed, installed_version, major_minor = self.checkExistingMariaDB()
@@ -1789,6 +1800,20 @@ module cyberpanel_ols {
else:
# RHEL-based MariaDB installation
# CRITICAL: Remove conflicting MariaDB compat packages first
# These packages from MariaDB 12.1 can conflict with MariaDB 10.11
self.stdOut("Removing conflicting MariaDB compat packages...", 1)
try:
# Remove MariaDB-server-compat packages that conflict with MariaDB 10.11
compat_remove_cmd = "dnf remove -y MariaDB-server-compat* 2>/dev/null || rpm -e --nodeps MariaDB-server-compat* 2>/dev/null || true"
result = subprocess.run(compat_remove_cmd, shell=True, timeout=60, capture_output=True)
if result.returncode == 0 or "not installed" in result.stdout.decode('utf-8', errors='ignore').lower():
self.stdOut("Removed conflicting MariaDB compat packages", 1)
else:
self.stdOut("No conflicting compat packages found or already removed", 1)
except Exception as e:
self.stdOut(f"Warning: Could not remove compat packages: {e}", 0)
# Check if MariaDB is already installed before setting up repository
is_installed, installed_version, major_minor = self.checkExistingMariaDB()
@@ -1809,7 +1834,7 @@ module cyberpanel_ols {
pass
# Set up MariaDB 12.1 repository only if not already installed
command = 'curl -LsS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | sudo bash -s -- --mariadb-server-version=12.1'
command = 'curl -LsS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | bash -s -- --mariadb-server-version=12.1'
self.call(command, self.distro, command, command, 1, 1, os.EX_OSERR, True)
command = 'dnf install mariadb-server mariadb-devel mariadb-client-utils -y'