diff options
author | Conley Owens <cco3@android.com> | 2015-04-29 10:45:37 -0700 |
---|---|---|
committer | Conley Owens <cco3@android.com> | 2015-04-29 10:45:37 -0700 |
commit | 4ccad7554b958c701653c41a72442cccf301e71a (patch) | |
tree | ce4fc626c19967f4167577625479e8df9c51f106 | |
parent | 403b64edf468204597559cf61b346b93af9af232 (diff) | |
download | git-repo-4ccad7554b958c701653c41a72442cccf301e71a.tar.gz |
Fix substitution err for schemeless manifest urlsv1.12.22
Previously, we used a regex that would only remove a phony string from
a url if it existed, but we recently replaced that with a slice. This
change goes back to the previous behavior.
Change-Id: I8baf527be01c4b49d45b903b31a1cd6315563d5b
-rw-r--r-- | manifest_xml.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 8b57bf52..cfbd9efa 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
@@ -90,7 +90,8 @@ class _XmlRemote(object): | |||
90 | # and then replacing it with the original when we are done. | 90 | # and then replacing it with the original when we are done. |
91 | 91 | ||
92 | if manifestUrl.find(':') != manifestUrl.find('/') - 1: | 92 | if manifestUrl.find(':') != manifestUrl.find('/') - 1: |
93 | url = urllib.parse.urljoin('gopher://' + manifestUrl, url)[9:] | 93 | url = urllib.parse.urljoin('gopher://' + manifestUrl, url) |
94 | url = re.sub(r'^gopher://', '', url) | ||
94 | else: | 95 | else: |
95 | url = urllib.parse.urljoin(manifestUrl, url) | 96 | url = urllib.parse.urljoin(manifestUrl, url) |
96 | return url | 97 | return url |