From 78154a63e86774fb8952f42883f7788e94d0c8d2 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 4 Nov 2016 16:49:19 -0700 Subject: Fix bug in distribution detection on unsupported platforms. --- lib/spack/spack/operating_systems/linux_distro.py | 12 ++++++++---- 1 file changed, 8 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 e18dab38fc..b9a39361da 100644 --- a/lib/spack/spack/operating_systems/linux_distro.py +++ b/lib/spack/spack/operating_systems/linux_distro.py @@ -1,5 +1,4 @@ import re -from external.distro import linux_distribution from spack.architecture import OperatingSystem @@ -12,9 +11,14 @@ class LinuxDistro(OperatingSystem): """ def __init__(self): - distname, version, _ = linux_distribution( - full_distribution_name=False) - distname, version = str(distname), str(version) + 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) + except ImportError as e: + distname, version = 'unknown', '' # Grabs major version from tuple on redhat; on other platforms # grab the first legal identifier in the version field. On -- cgit v1.2.3-60-g2f50