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

Update to distro 1.0.4 (#6788)

Browse Source 
* Update to the latest version of distro

* Update distro to 1.0.4
This commit is contained in:
Adam J. Stewart 2017-12-30 18:44:19 -05:00 committed by Todd Gamblin
parent da93c9b870
commit 010334bf22
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/spack/external/distro.py vendored
View File

@ -41,7 +41,7 @@
if not sys.platform.startswith('linux'): if not sys.platform.startswith('linux'):
raise ImportError('Unsupported platform: {0}'.format(sys.platform)) raise ImportError('Unsupported platform: {0}'.format(sys.platform))
_UNIXCONFDIR = '/etc' _UNIXCONFDIR = os.environ.get('UNIXCONFDIR', '/etc')
_OS_RELEASE_BASENAME = 'os-release' _OS_RELEASE_BASENAME = 'os-release'
#: Translation table for normalizing the "ID" attribute defined in os-release #: Translation table for normalizing the "ID" attribute defined in os-release
@ -983,28 +983,41 @@ def _get_distro_release_info(self):
distro_info['id'] = match.group(1) distro_info['id'] = match.group(1)
return distro_info return distro_info
else: else:
basenames = os.listdir(_UNIXCONFDIR) try:
# We sort for repeatability in cases where there are multiple basenames = os.listdir(_UNIXCONFDIR)
# distro specific files; e.g. CentOS, Oracle, Enterprise all # We sort for repeatability in cases where there are multiple
# containing `redhat-release` on top of their own. # distro specific files; e.g. CentOS, Oracle, Enterprise all
basenames.sort() # containing `redhat-release` on top of their own.
basenames.sort()
except OSError:
# This may occur when /etc is not readable but we can't be
# sure about the *-release files. Check common entries of
# /etc for information. If they turn out to not be there the
# error is handled in `_parse_distro_release_file()`.
basenames = ['SuSE-release',
'arch-release',
'base-release',
'centos-release',
'fedora-release',
'gentoo-release',
'mageia-release',
'manjaro-release',
'oracle-release',
'redhat-release',
'sl-release',
'slackware-version']
for basename in basenames: for basename in basenames:
if basename in _DISTRO_RELEASE_IGNORE_BASENAMES: if basename in _DISTRO_RELEASE_IGNORE_BASENAMES:
continue continue
match = _DISTRO_RELEASE_BASENAME_PATTERN.match(basename) match = _DISTRO_RELEASE_BASENAME_PATTERN.match(basename)
if match: if match:
try: filepath = os.path.join(_UNIXCONFDIR, basename)
filepath = os.path.join(_UNIXCONFDIR, basename) distro_info = self._parse_distro_release_file(filepath)
distro_info = self._parse_distro_release_file(filepath) if 'name' in distro_info:
if 'name' in distro_info: # The name is always present if the pattern matches
# The name is always present if the pattern matches self.distro_release_file = filepath
self.distro_release_file = filepath distro_info['id'] = match.group(1)
distro_info['id'] = match.group(1) return distro_info
return distro_info
except IOError:
# We found a file we do not have permission to read
# Continue checking candidate files for distro file.
continue
return {} return {}
def _parse_distro_release_file(self, filepath): def _parse_distro_release_file(self, filepath):
@ -1018,12 +1031,16 @@ def _parse_distro_release_file(self, filepath):
Returns: Returns:
A dictionary containing all information items. A dictionary containing all information items.
""" """
if os.path.isfile(filepath): try:
with open(filepath) as fp: with open(filepath) as fp:
# Only parse the first line. For instance, on SLES there # Only parse the first line. For instance, on SLES there
# are multiple lines. We don't want them... # are multiple lines. We don't want them...
return self._parse_distro_release_content(fp.readline()) return self._parse_distro_release_content(fp.readline())
return {} except (OSError, IOError):
# Ignore not being able to read a specific, seemingly version
# related file.
# See https://github.com/nir0s/distro/issues/162
return {}
@staticmethod @staticmethod
def _parse_distro_release_content(line): def _parse_distro_release_content(line):
@ -1075,11 +1092,9 @@ def main():
else: else:
logger.info('Name: %s', name(pretty=True)) logger.info('Name: %s', name(pretty=True))
distribution_version = version(pretty=True) distribution_version = version(pretty=True)
if distribution_version: logger.info('Version: %s', distribution_version)
logger.info('Version: %s', distribution_version)
distribution_codename = codename() distribution_codename = codename()
if distribution_codename: logger.info('Codename: %s', distribution_codename)
logger.info('Codename: %s', distribution_codename)
if __name__ == '__main__': if __name__ == '__main__':