Skip to content

A
ansible
Commit d291dae5 by Alexander Gubin
Options

Exit loop after detecting os-release

parent 1968f996
Showing with 1 additions and 2 deletions
lib/ansible/module_utils/facts.py
...@@ -369,6 +369,7 @@ class Facts(object): ...@@ -369,6 +369,7 @@ class Facts(object):
else: else:
release = "0" # no minor number, so it is the first release release = "0" # no minor number, so it is the first release
self.facts['distribution_release'] = release self.facts['distribution_release'] = release
break
elif path == '/etc/SuSE-release': elif path == '/etc/SuSE-release':
if 'open' in data.lower(): if 'open' in data.lower():
data = data.splitlines() data = data.splitlines()
...@@ -378,7 +379,6 @@ class Facts(object): ...@@ -378,7 +379,6 @@ class Facts(object):
release = re.search('CODENAME *= *([^\n]+)', line) release = re.search('CODENAME *= *([^\n]+)', line)
if release: if release:
self.facts['distribution_release'] = release.groups()[0].strip() self.facts['distribution_release'] = release.groups()[0].strip()
break
elif 'enterprise' in data.lower(): elif 'enterprise' in data.lower():
lines = data.splitlines() lines = data.splitlines()
distribution = lines[0].split()[0] distribution = lines[0].split()[0]
...@@ -391,7 +391,6 @@ class Facts(object): ...@@ -391,7 +391,6 @@ class Facts(object):
if release: if release:
self.facts['distribution_release'] = release.group(1) self.facts['distribution_release'] = release.group(1)
self.facts['distribution_version'] = self.facts['distribution_version'] + '.' + release.group(1) self.facts['distribution_version'] = self.facts['distribution_version'] + '.' + release.group(1)
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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment