FreeBSD STABLE distribution not correctly parsed (#34770)

pull/34897/merge
Berend de Boer 7 years ago committed by Adam Miller
parent 6c38443a9c
commit 1f539e6601

@ -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))

Loading…
Cancel
Save