From e03167e476c73da4c94e324d8654a16dc536fff6 Mon Sep 17 00:00:00 2001 From: Jacob Sayles Date: Mon, 1 Jun 2020 10:18:54 -0700 Subject: [PATCH] Use the distro package in dist_name if it exists or fall back to platform. Fixes #314 --- modoboa_installer/utils.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/utils.py b/modoboa_installer/utils.py index 08732df..d95eeae 100644 --- a/modoboa_installer/utils.py +++ b/modoboa_installer/utils.py @@ -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.7 and up way + import distro + name, version, _id = distro.linux_distribution() + except ModuleNotFoundError as e: + # Python 3.6 and down way + import platform + name, version, _id = platform.linux_distribution() return "unknown" if not name else name.lower()