[CHANGE] elif to safe potential if checks and time

This commit is contained in:
Peter Pfeufer 2025-01-22 04:23:19 +01:00
parent 6363bb706a
commit 58f5a5b41d
No known key found for this signature in database

View File

@ -70,10 +70,8 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
errors.append(Warning("Unable to confirm MySQL Version"))
return errors
if mysql_version.major < 8: # This will also catch Mariadb 5.x
errors.append(Error(f"MySQL or MariaDB {mysql_version.public} EOL", hint=mysql_quick_guide_link, id="allianceauth.checks.A009"))
if mysql_version.major == 8: # MySQL 8
# MySQL 8
if mysql_version.major == 8:
if mysql_version.minor == 4 and timezone.now() > timezone.datetime(year=2032, month=4, day=30, tzinfo=timezone.utc):
errors.append(Error(f"MySQL {mysql_version.public} EOL", hint=mysql_quick_guide_link, id="allianceauth.checks.A004"))
elif mysql_version.minor == 3:
@ -84,6 +82,11 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
errors.append(Error(f"MySQL {mysql_version.public} EOL", hint=mysql_quick_guide_link, id="allianceauth.checks.A007"))
elif mysql_version.minor == 0 and timezone.now() > timezone.datetime(year=2026, month=4, day=30, tzinfo=timezone.utc):
errors.append(Error(f"MySQL {mysql_version.public} EOL", hint=mysql_quick_guide_link, id="allianceauth.checks.A008"))
# MySQL below 8
# This will also catch Mariadb 5.x
elif mysql_version.major < 8:
errors.append(Error(f"MySQL or MariaDB {mysql_version.public} EOL", hint=mysql_quick_guide_link, id="allianceauth.checks.A009"))
return errors
@ -119,7 +122,7 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint=mariadb_download_link, id="allianceauth.checks.A013"))
# MariaDB 10
if mariadb_version.major == 10:
elif mariadb_version.major == 10:
if mariadb_version.minor == 11 and timezone.now() > timezone.datetime(year=2028, month=2, day=10, tzinfo=timezone.utc):
errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint=mariadb_download_link, id="allianceauth.checks.A014"))
elif mariadb_version.minor == 6 and timezone.now() > timezone.datetime(year=2026, month=7, day=6, tzinfo=timezone.utc):