From 2f90a4f4e25f235a3a5265a57f3d42a4262e5733 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 8 Mar 2016 07:42:42 -0600 Subject: [PATCH] Strip proc_1 before testing it. Fixes #14858 --- lib/ansible/module_utils/facts.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 39dcd5455a..1aa16c9fee 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -581,13 +581,16 @@ class Facts(object): else: proc_1 = os.path.basename(proc_1) + if proc_1 is not None: + proc_1 = proc_1.strip() + if proc_1 == 'init' or proc_1.endswith('sh'): # many systems return init, so this cannot be trusted, if it ends in 'sh' it probalby is a shell in a container proc_1 = None # if not init/None it should be an identifiable or custom init, so we are done! if proc_1 is not None: - self.facts['service_mgr'] = proc_1.strip() + self.facts['service_mgr'] = proc_1 # start with the easy ones elif self.facts['distribution'] == 'MacOSX':