From 449b23b698d7d4b13909667a49a0698eb495eeaa Mon Sep 17 00:00:00 2001 From: Vitalii Dmitriev Date: Mon, 18 Dec 2023 11:25:16 +0200 Subject: manifest_xml: fix url normalization for inits and remotes Before the change, repo normalizes the urls with a following format only: git@github.com:foo/bar It doesn't cover the following case: Results to: error: Cannot fetch somerepo from ssh://git@github.com/org/git@github.com:org/somerepo Current change fixes it by normalizing this format: git@github.com:foo Test: ./run_tests tests/test_manifest_xml.py Change-Id: I1ad0f5df0d52c0b7229ba4c9a4db4eecb5c1a003 Signed-off-by: Vitalii Dmitriev Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/398337 Commit-Queue: Vitalii Dmitriev Tested-by: Vitalii Dmitriev Reviewed-by: Mike Frysinger --- manifest_xml.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifest_xml.py') diff --git a/manifest_xml.py b/manifest_xml.py index 7e533a02..4f752122 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -133,8 +133,8 @@ def normalize_url(url: str) -> str: url = url.rstrip("/") parsed_url = urllib.parse.urlparse(url) - # This matches patterns like "git@github.com:foo/bar". - scp_like_url_re = r"^[^/:]+@[^/:]+:[^/]+/" + # This matches patterns like "git@github.com:foo". + scp_like_url_re = r"^[^/:]+@[^/:]+:[^/]+" # If our URL is missing a schema and matches git's # SCP-like syntax we should convert it to a proper -- cgit v1.2.3-54-g00ecf