zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in distribution detection on unsupported platforms.

Browse Source
This commit is contained in:
Todd Gamblin 2016-11-04 16:49:19 -07:00
parent 9cd83a4efb
commit 78154a63e8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/operating_systems/linux_distro.py
View File

@ -1,5 +1,4 @@
import re import re
from external.distro import linux_distribution
from spack.architecture import OperatingSystem from spack.architecture import OperatingSystem
@ -12,9 +11,14 @@ class LinuxDistro(OperatingSystem):
""" """
def __init__(self): def __init__(self):
distname, version, _ = linux_distribution( try:
full_distribution_name=False) # This will throw an error if imported on a non-Linux platform.
distname, version = str(distname), str(version) 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 # Grabs major version from tuple on redhat; on other platforms
# grab the first legal identifier in the version field. On # grab the first legal identifier in the version field. On