diff options
| author | Joe Kilner <joekilner@google.com> | 2016-10-27 15:53:53 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2016-10-27 15:56:38 -0700 |
| commit | 6e310790334b2cd7f7ba72cf3dbd3585176ccbdf (patch) | |
| tree | 5f2188eb4bcaf7288b2927165d03e308ddd7a534 | |
| parent | 4d5bb68d58f12885ea06fb73d5e17d8c780c9ff8 (diff) | |
| download | git-repo-6e310790334b2cd7f7ba72cf3dbd3585176ccbdf.tar.gz | |
Add sso to list of known schemes for relative URLs
repo already special-cases sso:// URLs to behave similarly to https://
and rpc:// elsewhere in repo, but it forgot to do so here.
Noticed when trying to use relative URLs in a manifest obtained using
an sso:// URL.
Change-Id: Ia11469a09bbd6e444dbc4f22c82f9bbe9f5fd083
| -rw-r--r-- | manifest_xml.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 9c882af6..0859e1fb 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -40,8 +40,18 @@ LOCAL_MANIFEST_NAME = 'local_manifest.xml' | |||
| 40 | LOCAL_MANIFESTS_DIR_NAME = 'local_manifests' | 40 | LOCAL_MANIFESTS_DIR_NAME = 'local_manifests' |
| 41 | 41 | ||
| 42 | # urljoin gets confused if the scheme is not known. | 42 | # urljoin gets confused if the scheme is not known. |
| 43 | urllib.parse.uses_relative.extend(['ssh', 'git', 'persistent-https', 'rpc']) | 43 | urllib.parse.uses_relative.extend([ |
| 44 | urllib.parse.uses_netloc.extend(['ssh', 'git', 'persistent-https', 'rpc']) | 44 | 'ssh', |
| 45 | 'git', | ||
| 46 | 'persistent-https', | ||
| 47 | 'sso', | ||
| 48 | 'rpc']) | ||
| 49 | urllib.parse.uses_netloc.extend([ | ||
| 50 | 'ssh', | ||
| 51 | 'git', | ||
| 52 | 'persistent-https', | ||
| 53 | 'sso', | ||
| 54 | 'rpc']) | ||
| 45 | 55 | ||
| 46 | class _Default(object): | 56 | class _Default(object): |
| 47 | """Project defaults within the manifest.""" | 57 | """Project defaults within the manifest.""" |