Merge pull request #323 from jsayles/master
Use bistro package in utils.dist_name if it exists
This commit is contained in:
@@ -4,7 +4,6 @@ import contextlib
|
||||
import datetime
|
||||
import glob
|
||||
import os
|
||||
import platform
|
||||
import random
|
||||
import shutil
|
||||
import string
|
||||
@@ -76,7 +75,14 @@ def exec_cmd(cmd, sudo_user=None, pinput=None, login=True, **kwargs):
|
||||
|
||||
def dist_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()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user