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

Merge pull request #4886 from sergeyhush/devel

Browse source 
fix when the system does not have lsb_release script, but has /etc/lsb_release file
This commit is contained in:
jctanner 2013-12-13 11:25:45 -08:00
commit 91f903eabe
1 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
library/system/setup
View file

@ -381,28 +381,49 @@ class Facts(object):
def get_lsb_facts(self): def get_lsb_facts(self):
lsb_path = module.get_bin_path('lsb_release') lsb_path = module.get_bin_path('lsb_release')
if lsb_path is None: if lsb_path:
return self.facts rc, out, err = module.run_command([lsb_path, "-a"])
rc, out, err = module.run_command([lsb_path, "-a"]) if rc == 0:
if rc == 0: self.facts['lsb'] = {}
for line in out.split('\n'):
if len(line) < 1:
continue
value = line.split(':', 1)[1].strip()
if 'LSB Version:' in line:
self.facts['lsb']['release'] = value
elif 'Distributor ID:' in line:
self.facts['lsb']['id'] = value
elif 'Description:' in line:
self.facts['lsb']['description'] = value
elif 'Release:' in line:
self.facts['lsb']['release'] = value
elif 'Codename:' in line:
self.facts['lsb']['codename'] = value
if 'lsb' in self.facts and 'release' in self.facts['lsb']:
self.facts['lsb']['major_release'] = self.facts['lsb']['release'].split('.')[0]
elif lsb_path is None and os.path.exists('/etc/lsb-release'):
self.facts['lsb'] = {} self.facts['lsb'] = {}
for line in out.split('\n'): f = open('/etc/lsb-release', 'r')
if len(line) < 1: try:
continue for line in f.readlines():
value = line.split(':', 1)[1].strip() value = line.split('=',1)[1].strip()
if 'LSB Version:' in line: if 'DISTRIB_ID' in line:
self.facts['lsb']['release'] = value self.facts['lsb']['id'] = value
elif 'Distributor ID:' in line: elif 'DISTRIB_RELEASE' in line:
self.facts['lsb']['id'] = value self.facts['lsb']['release'] = value
elif 'Description:' in line: elif 'DISTRIB_DESCRIPTION' in line:
self.facts['lsb']['description'] = value self.facts['lsb']['description'] = value
elif 'Release:' in line: elif 'DISTRIB_CODENAME' in line:
self.facts['lsb']['release'] = value self.facts['lsb']['codename'] = value
elif 'Codename:' in line: finally:
self.facts['lsb']['codename'] = value f.close()
else:
return self.facts
if 'lsb' in self.facts and 'release' in self.facts['lsb']: if 'lsb' in self.facts and 'release' in self.facts['lsb']:
self.facts['lsb']['major_release'] = self.facts['lsb']['release'].split('.')[0] self.facts['lsb']['major_release'] = self.facts['lsb']['release'].split('.')[0]
def get_selinux_facts(self): def get_selinux_facts(self):
if not HAVE_SELINUX: if not HAVE_SELINUX:
self.facts['selinux'] = False self.facts['selinux'] = False