mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-08-05 13:44:24 -07:00
fix lsb fact gathering
was erroring out when rc !=0 also fixed redundant paths fixes #14965
This commit is contained in:
parent
d7d47bcd75
commit
0cb804f0c2
1 changed files with 14 additions and 19 deletions
|
@ -645,8 +645,6 @@ class Facts(object):
|
||||||
self.facts['lsb']['release'] = value
|
self.facts['lsb']['release'] = value
|
||||||
elif 'Codename:' in line:
|
elif 'Codename:' in line:
|
||||||
self.facts['lsb']['codename'] = value
|
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'):
|
elif lsb_path is None and os.path.exists('/etc/lsb-release'):
|
||||||
self.facts['lsb'] = {}
|
self.facts['lsb'] = {}
|
||||||
for line in get_file_lines('/etc/lsb-release'):
|
for line in get_file_lines('/etc/lsb-release'):
|
||||||
|
@ -659,13 +657,10 @@ class Facts(object):
|
||||||
self.facts['lsb']['description'] = value
|
self.facts['lsb']['description'] = value
|
||||||
elif 'DISTRIB_CODENAME' in line:
|
elif 'DISTRIB_CODENAME' in line:
|
||||||
self.facts['lsb']['codename'] = value
|
self.facts['lsb']['codename'] = value
|
||||||
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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue