From 037ece674b28569791b1d89da87b805b8f1a3810 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 29 Nov 2021 16:26:19 +0100 Subject: distro: don't use deprecated linux_distribution (#27658) --- lib/spack/spack/operating_systems/linux_distro.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/operating_systems/linux_distro.py b/lib/spack/spack/operating_systems/linux_distro.py index 758e8bea47..8bb2aa7749 100644 --- a/lib/spack/spack/operating_systems/linux_distro.py +++ b/lib/spack/spack/operating_systems/linux_distro.py @@ -18,10 +18,8 @@ class LinuxDistro(OperatingSystem): def __init__(self): try: # This will throw an error if imported on a non-Linux platform. - from external.distro import linux_distribution - distname, version, _ = linux_distribution( - full_distribution_name=False) - distname, version = str(distname), str(version) + import external.distro + distname, version = external.distro.id(), external.distro.version() except ImportError: distname, version = 'unknown', '' -- cgit v1.2.3-60-g2f50