Merge pull request #9331 from marcinpraczko/devel

Fix detecting distribution release on OpenSuSE
pull/9313/head
Michael DeHaan 10 years ago
commit bdf3ec1e21

@ -328,10 +328,11 @@ class Facts(object):
break break
elif path == '/etc/SuSE-release': elif path == '/etc/SuSE-release':
data = data.splitlines() data = data.splitlines()
release = re.search('CODENAME *= *([^\n]+)\n', data) for line in data:
if release: release = re.search('CODENAME *= *([^\n]+)', line)
self.facts['distribution_release'] = release.groups()[0].strip() if release:
break self.facts['distribution_release'] = release.groups()[0].strip()
break
elif name == 'Debian': elif name == 'Debian':
data = get_file_content(path) data = get_file_content(path)
if 'Debian' in data: if 'Debian' in data:

Loading…
Cancel
Save