cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'obsd-fix-release' of https://github.com/johanwiren/ansible into johanwiren-obsd-fix-release

Browse source
This commit is contained in:
James Cammarata 2013-09-25 14:49:57 -05:00
commit 301a00ccf5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/system/setup
View file

@ -274,9 +274,9 @@ class Facts(object):
self.facts['distribution'] = 'OpenBSD' self.facts['distribution'] = 'OpenBSD'
self.facts['distribution_release'] = platform.release() self.facts['distribution_release'] = platform.release()
rc, out, err = module.run_command("/sbin/sysctl -n kern.version") rc, out, err = module.run_command("/sbin/sysctl -n kern.version")
data = re.search('OpenBSD\s[0-9]+.[0-9]+(-\S+)?\s.*', out) match = re.match('OpenBSD\s[0-9]+.[0-9]+-(\S+)\s.*', out)
if data: if match:
self.facts['distribution_version'] = data.groups()[0][1:] self.facts['distribution_version'] = match.groups()[0]
else: else:
self.facts['distribution_version'] = 'release' self.facts['distribution_version'] = 'release'
else: else: