External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3703 from cchurch/allow-file-scm-urls

Browse Source 
Enable support for file scheme in SCM URLs.
This commit is contained in:
Chris Church
2016-10-17 23:51:10 -04:00
committed by GitHub
parent f5f4785714 58b434e08a
commit e02d945e1d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/utils.py
View File

@@ -244,7 +244,7 @@ def update_scm_url(scm_type, url, username=True, password=True,
# SCP style before passed to git module. # SCP style before passed to git module.
parts = urlparse.urlsplit('git+ssh://%s' % modified_url) parts = urlparse.urlsplit('git+ssh://%s' % modified_url)
# Handle local paths specified without file scheme (e.g. /path/to/foo). # Handle local paths specified without file scheme (e.g. /path/to/foo).
# Only supported by git and hg. (not currently allowed) # Only supported by git and hg.
elif scm_type in ('git', 'hg'): elif scm_type in ('git', 'hg'):
if not url.startswith('/'): if not url.startswith('/'):
parts = urlparse.urlsplit('file:///%s' % url) parts = urlparse.urlsplit('file:///%s' % url)
@@ -255,9 +255,9 @@ def update_scm_url(scm_type, url, username=True, password=True,
# Validate that scheme is valid for given scm_type. # Validate that scheme is valid for given scm_type.
scm_type_schemes = { scm_type_schemes = {
'git': ('ssh', 'git', 'git+ssh', 'http', 'https', 'ftp', 'ftps'), 'git': ('ssh', 'git', 'git+ssh', 'http', 'https', 'ftp', 'ftps', 'file'),
'hg': ('http', 'https', 'ssh'), 'hg': ('http', 'https', 'ssh', 'file'),
'svn': ('http', 'https', 'svn', 'svn+ssh'), 'svn': ('http', 'https', 'svn', 'svn+ssh', 'file'),
} }
if parts.scheme not in scm_type_schemes.get(scm_type, ()): if parts.scheme not in scm_type_schemes.get(scm_type, ()):
raise ValueError('Unsupported %s URL' % scm_type) raise ValueError('Unsupported %s URL' % scm_type)