internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix distribution_facts missing on BSD (#15780)

Browse Source 
The previous fix in #15773 only solved MacOSX, but left other BSDs broken

fixes #15768
This commit is contained in:
Robin Roth
2016-05-09 16:55:28 +02:00
committed by Brian Coca
parent 72ca3b2b5b
commit 30e5999812
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/module_utils/facts.py
View File

@@ -653,10 +653,7 @@ class Distribution(object):
self.module = module
def populate(self):
if self.system == 'Linux':
self.get_distribution_facts()
elif self.system == 'Darwin':
self.get_distribution_facts()
self.get_distribution_facts()
return self.facts
def get_distribution_facts(self):
@@ -678,7 +675,7 @@ class Distribution(object):
cleanedname = self.system.replace('-','')
distfunc = getattr(self, 'get_distribution_'+cleanedname)
distfunc()
else:
elif self.system == 'Linux':
# try to find out which linux distribution this is
dist = platform.dist()
self.facts['distribution'] = dist[0].capitalize() or 'NA'