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

FreeBSD STABLE distribution not correctly parsed (#34770)

Browse source
This commit is contained in:
Berend de Boer 2018-01-16 10:49:58 +13:00 committed by Adam Miller
parent 6c38443a9c
commit 1f539e6601
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/facts/system/distribution.py
View file

@ -496,7 +496,7 @@ class Distribution(object):
def get_distribution_FreeBSD(self): def get_distribution_FreeBSD(self):
freebsd_facts = {} freebsd_facts = {}
freebsd_facts['distribution_release'] = platform.release() freebsd_facts['distribution_release'] = platform.release()
data = re.search(r'(\d+)\.(\d+)-RELEASE.*', freebsd_facts['distribution_release']) data = re.search(r'(\d+)\.(\d+)-(RELEASE|STABLE).*', freebsd_facts['distribution_release'])
if data: if data:
freebsd_facts['distribution_major_version'] = data.group(1) freebsd_facts['distribution_major_version'] = data.group(1)
freebsd_facts['distribution_version'] = '%s.%s' % (data.group(1), data.group(2)) freebsd_facts['distribution_version'] = '%s.%s' % (data.group(1), data.group(2))