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

Merge pull request #9329 from mcodd/devel

Browse source 
python2.4 compatibility issue with urlparse
This commit is contained in:
Toshio Kuratomi 2014-10-14 11:56:34 -04:00
commit 139e4767e4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/known_hosts.py
View file

@ -72,12 +72,14 @@ def get_fqdn(repo_url):
if 'ssh' not in parts[0] and 'git' not in parts[0]: if 'ssh' not in parts[0] and 'git' not in parts[0]:
# don't try and scan a hostname that's not ssh # don't try and scan a hostname that's not ssh
return None return None
# parts[1] will be empty on python2.4 on ssh:// or git:// urls, so
# ensure we actually have a parts[1] before continuing.
if parts[1] != '': if parts[1] != '':
result = parts[1] result = parts[1]
if ":" in result: if ":" in result:
result = result.split(":")[0] result = result.split(":")[0]
if "@" in result: if "@" in result:
result = result.split("@", 1)[1] result = result.split("@", 1)[1]
return result return result