evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #323 from jsayles/master

Browse Source 
Use bistro package in utils.dist_name if it exists
This commit is contained in:
Antoine Nguyen
2020-06-02 20:36:12 +02:00
committed by GitHub
parent c0d61d86c7 07515508d7
commit 1771c34f4b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modoboa_installer/utils.py
View File

@@ -4,7 +4,6 @@ import contextlib
import datetime import datetime
import glob import glob
import os import os
import platform
import random import random
import shutil import shutil
import string import string
@@ -76,7 +75,14 @@ def exec_cmd(cmd, sudo_user=None, pinput=None, login=True, **kwargs):
def dist_name(): def dist_name():
"""Try to guess the distribution name.""" """Try to guess the distribution name."""
name, version, _id = platform.linux_distribution() try:
# Python 3.8 and up way
import distro
name, version, _id = distro.linux_distribution()
except ImportError as e:
# Python 3.7 and down way
import platform
name, version, _id = platform.linux_distribution()
return "unknown" if not name else name.lower() return "unknown" if not name else name.lower()