Use package distro to find linux distribution

This commit is contained in:
VirtuBox
2019-08-19 12:22:16 +02:00
parent b44bfa1af8
commit d6807da095
2 changed files with 9 additions and 7 deletions

View File

@@ -57,7 +57,7 @@ if not os.path.isfile('/root/.gitconfig'):
shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
setup(name='wo',
version='3.9.8.1',
version='3.9.8.2',
description=long_description,
long_description=long_description,
classifiers=[],
@@ -87,6 +87,7 @@ setup(name='wo',
'sh',
'SQLAlchemy',
'requests',
'distro',
],
data_files=[('/etc/wo', ['config/wo.conf']),
('/etc/wo/plugins.d', conf),

View File

@@ -1,5 +1,5 @@
"""WordOps core variable module"""
import platform
import distro
import socket
import configparser
import os
@@ -25,11 +25,12 @@ class WOVariables():
wo_date = datetime.datetime.now().strftime('%d%b%Y%H%M%S')
# WordOps core variables
wo_distro = os.popen("/usr/bin/lsb_release -si "
"| tr -d \'\\n\'").read().lower()
wo_platform_version = platform.linux_distribution()[1]
wo_platform_codename = os.popen(
"/usr/bin/lsb_release -sc | tr -d \'\\n\'").read()
wo_distro = distro.linux_distribution(
full_distribution_name=False)[0].lower()
wo_platform_version = distro.linux_distribution(
full_distribution_name=False)[1].lower()
wo_platform_codename = distro.linux_distribution(
full_distribution_name=False)[2].lower()
# Get timezone of system
if os.path.isfile('/etc/timezone'):