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

Use package distro to find linux distribution

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
setup.py
View File

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

13
wo/core/variables.py
View File

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