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

Fix String Type for Python 3 Branch Comparison

Browse source 
* Use the `to_native` conversion method to convert a command output to the
  appropriate form when looking for branch names in the command output,
  therefore avoiding a `TypeError` in Python 3.
This commit is contained in:
Fahri Cihan Demirci 2016-10-24 18:55:01 -04:00 committed by Matt Clay
parent c2d37f1db9
commit 1ecb63f0e0
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/modules/source_control/git.py
View file

@ -223,7 +223,7 @@ from distutils.version import LooseVersion
from ansible.module_utils.basic import AnsibleModule, get_module_path from ansible.module_utils.basic import AnsibleModule, get_module_path
from ansible.module_utils.known_hosts import add_git_host_key from ansible.module_utils.known_hosts import add_git_host_key
from ansible.module_utils.six import b, string_types from ansible.module_utils.six import b, string_types
from ansible.module_utils._text import to_bytes, to_native from ansible.module_utils._text import to_native
def head_splitter(headfile, remote, module=None, fail_on_error=False): def head_splitter(headfile, remote, module=None, fail_on_error=False):
@ -519,7 +519,7 @@ def get_tags(git_path, module, dest):
def is_remote_branch(git_path, module, dest, remote, version): def is_remote_branch(git_path, module, dest, remote, version):
cmd = '%s ls-remote %s -h refs/heads/%s' % (git_path, remote, version) cmd = '%s ls-remote %s -h refs/heads/%s' % (git_path, remote, version)
(rc, out, err) = module.run_command(cmd, check_rc=True, cwd=dest) (rc, out, err) = module.run_command(cmd, check_rc=True, cwd=dest)
if to_bytes(version, errors='surrogate_or_strict') in out: if to_native(version, errors='surrogate_or_strict') in out:
return True return True
else: else:
return False return False