Skip to content

Commit 2dfda86

Browse files
authored
Merge pull request #200 from fosslight/git
Don't change prefix for ssh link
2 parents 07e758d + e52eca0 commit 2dfda86

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/fosslight_util/download.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def parse_src_link(src_link):
7777
if src_link.startswith("git://github.com/"):
7878
src_link_changed = change_src_link_to_https(src_link_split[0])
7979
elif src_link.startswith("[email protected]:"):
80-
src_link_changed = change_ssh_link_to_https(src_link_split[0])
80+
src_link_changed = src_link_split[0]
8181
else:
8282
if "rubygems.org" in src_link:
8383
src_info["rubygems"] = True
@@ -122,6 +122,7 @@ def cli_download_and_extract(link: str, target_dir: str, log_dir: str, checkout_
122122

123123
# General download (git clone, wget)
124124
success_git, msg, oss_name, oss_version = download_git_clone(link, target_dir, checkout_to, tag, branch, ssh_key)
125+
link = change_ssh_link_to_https(link)
125126
if (not is_rubygems) and (not success_git):
126127
if os.path.isfile(target_dir):
127128
shutil.rmtree(target_dir)
@@ -244,7 +245,7 @@ def download_git_clone(git_url, target_dir, checkout_to="", tag="", branch="", s
244245
success = False
245246
else:
246247
if ssh_key:
247-
logger.info(f"Download git with ssh_key")
248+
logger.info(f"Download git with ssh_key:{git_url}")
248249
git_ssh_cmd = f'ssh -i {ssh_key}'
249250
with Git().custom_environment(GIT_SSH_COMMAND=git_ssh_cmd):
250251
success, oss_version = download_git_repository(refs_to_checkout, git_url, target_dir, tag)

0 commit comments

Comments
 (0)