wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7789 from mattjbray/fix-get-fqdn

Browse source 
fix for repo urls like ssh://git@github.com/ansible/ansible.git
This commit is contained in:
James Cammarata 2014-06-16 07:23:33 -05:00
commit ab965879c7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ def add_git_host_key(module, url, accept_hostkey=True, create_dir=True):
if rc != 0:
module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err))
else:
module.fail_json(msg="%s has an unknown hostkey. Set accept_hostkey to True or manually add the hostkey prior to running the git module" % fqdn)
module.fail_json(msg="%s has an unknown hostkey. Set accept_hostkey to True or manually add the hostkey prior to running the git module" % fqdn)
def get_fqdn(repo_url):
@ -71,6 +71,8 @@ def get_fqdn(repo_url):
parts = urlparse.urlparse(repo_url)
if parts[1] != '':
result = parts[1]
if "@" in result:
result = result.split("@", 1)[1]
return result