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

Merge pull request #1851 from Pinkbyte/distribution_fix

Browse source 
Fix distribution detection - return string instead of functions
This commit is contained in:
Michael DeHaan 2013-01-10 05:03:17 -08:00
commit f095f7c8c5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_common.py
View file

@ -96,10 +96,10 @@ def get_distribution():
''' return the distribution name ''' ''' return the distribution name '''
if platform.system() == 'Linux': if platform.system() == 'Linux':
try: try:
distribution = platform.linux_distribution()[0].capitalize distribution = platform.linux_distribution()[0].capitalize()
except: except:
# FIXME: MethodMissing, I assume? # FIXME: MethodMissing, I assume?
distribution = platform.dist()[0].capitalize distribution = platform.dist()[0].capitalize()
else: else:
distribution = None distribution = None
return distribution return distribution