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

Convert command output to native string (#4559)

Browse source 
Without it, the module always return changed on python3,
which is harmless but add noise and can have some side effects.
This commit is contained in:
Michael Scherer 2016-08-27 15:53:13 +02:00 committed by Matt Clay
parent 66b0a1ef2d
commit 338a8c8632
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/system/hostname.py
View file

@ -49,6 +49,7 @@ from distutils.version import LooseVersion
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.facts import * from ansible.module_utils.facts import *
from ansible.module_utils._text import to_bytes, to_native
class UnimplementedStrategy(object): class UnimplementedStrategy(object):
@ -135,7 +136,7 @@ class GenericStrategy(object):
if rc != 0: if rc != 0:
self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" %
(rc, out, err)) (rc, out, err))
return out.strip() return to_native(out).strip()
def set_current_hostname(self, name): def set_current_hostname(self, name):
cmd = [self.hostname_cmd, name] cmd = [self.hostname_cmd, name]
@ -297,7 +298,7 @@ class SystemdStrategy(GenericStrategy):
if rc != 0: if rc != 0:
self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" %
(rc, out, err)) (rc, out, err))
return out.strip() return to_native(out).strip()
def set_current_hostname(self, name): def set_current_hostname(self, name):
if len(name) > 64: if len(name) > 64:
@ -314,7 +315,7 @@ class SystemdStrategy(GenericStrategy):
if rc != 0: if rc != 0:
self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" %
(rc, out, err)) (rc, out, err))
return out.strip() return to_native(out).strip()
def set_permanent_hostname(self, name): def set_permanent_hostname(self, name):
if len(name) > 64: if len(name) > 64:
@ -442,7 +443,7 @@ class SolarisStrategy(GenericStrategy):
if rc != 0: if rc != 0:
self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" %
(rc, out, err)) (rc, out, err))
return out.strip() return to_native(out).strip()
def set_permanent_hostname(self, name): def set_permanent_hostname(self, name):
cmd = [self.hostname_cmd, name] cmd = [self.hostname_cmd, name]