Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update distro.linux_distribution & mariadb_ver [10.8]

Browse Source 
Fix: DeprecationWarning: distro.linux_distribution() is deprecated
Deprecated since version 3.5, removed in version 3.7.

Update:
OVH MariaDB mirror has been updated and support Ubuntu 22.04 [jammy]
This commit is contained in:
Hamada Habib
2022-07-12 08:33:01 +02:00
committed by GitHub
parent 3c15940f4e
commit cdbdf2cc22
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wo/core/variables.py
View File

@@ -1,12 +1,13 @@
"""WordOps core variable module""" """WordOps core variable module"""
import configparser import configparser
import os import os
import sys
from datetime import datetime from datetime import datetime
from re import match from re import match
from socket import getfqdn from socket import getfqdn
from shutil import copy2 from shutil import copy2
from distro import linux_distribution from distro import distro, linux_distribution
from sh import git from sh import git
@@ -30,13 +31,19 @@ class WOVar():
# WordOps core variables # WordOps core variables
# linux distribution # linux distribution
wo_distro = linux_distribution( if sys.version_info <= (3, 7):
full_distribution_name=False)[0].lower() wo_distro = linux_distribution(
wo_platform_version = linux_distribution( full_distribution_name=False)[0].lower()
full_distribution_name=False)[1].lower() wo_platform_version = linux_distribution(
# distro codename (bionic, xenial, stretch ...) full_distribution_name=False)[1].lower()
wo_platform_codename = linux_distribution( # distro codename (bionic, xenial, stretch ...)
full_distribution_name=False)[2].lower() wo_platform_codename = linux_distribution(
full_distribution_name=False)[2].lower()
else:
wo_distro = distro.id()
wo_platform_version = distro.version()
# distro codename (bionic, xenial, stretch ...)
wo_platform_codename = distro.codename()
# Get timezone of system # Get timezone of system
if os.path.isfile('/etc/timezone'): if os.path.isfile('/etc/timezone'):
@@ -171,7 +178,10 @@ class WOVar():
else: else:
mariadb_ver = '10.3' mariadb_ver = '10.3'
else: else:
mariadb_ver = '10.5' if wo_platform_codename == 'jammy':
mariadb_ver = '10.8'
else:
mariadb_ver = '10.5'
wo_mysql = wo_mysql + ["mariadb-backup"] wo_mysql = wo_mysql + ["mariadb-backup"]
wo_mysql_client = ["mariadb-client", "python3-mysqldb"] wo_mysql_client = ["mariadb-client", "python3-mysqldb"]
@@ -183,8 +193,9 @@ class WOVar():
# APT repositories # APT repositories
wo_mysql_repo = ("deb [arch=amd64,arm64,ppc64el] " wo_mysql_repo = ("deb [arch=amd64,arm64,ppc64el] "
"http://mariadb.mirrors.ovh.net/MariaDB/repo/" "http://mariadb.mirrors.ovh.net/MariaDB/repo/"
"10.5/{distro} {codename} main" "{version}/{distro} {codename} main"
.format(distro=wo_distro, .format(version=mariadb_ver,
distro=wo_distro,
codename=wo_platform_codename)) codename=wo_platform_codename))
if wo_distro == 'ubuntu': if wo_distro == 'ubuntu':
wo_php_repo = "ppa:ondrej/php" wo_php_repo = "ppa:ondrej/php"