Skip to content

Don't change prefix for ssh link #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Don't change prefix for ssh link #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/fosslight_util/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def parse_src_link(src_link):
if src_link.startswith("git://github.com/"):
src_link_changed = change_src_link_to_https(src_link_split[0])
elif src_link.startswith("[email protected]:"):
src_link_changed = change_ssh_link_to_https(src_link_split[0])
src_link_changed = src_link_split[0]
else:
if "rubygems.org" in src_link:
src_info["rubygems"] = True
Expand Down Expand Up @@ -122,6 +122,7 @@ def cli_download_and_extract(link: str, target_dir: str, log_dir: str, checkout_

# General download (git clone, wget)
success_git, msg, oss_name, oss_version = download_git_clone(link, target_dir, checkout_to, tag, branch, ssh_key)
link = change_ssh_link_to_https(link)
if (not is_rubygems) and (not success_git):
if os.path.isfile(target_dir):
shutil.rmtree(target_dir)
Expand Down Expand Up @@ -244,7 +245,7 @@ def download_git_clone(git_url, target_dir, checkout_to="", tag="", branch="", s
success = False
else:
if ssh_key:
logger.info(f"Download git with ssh_key")
logger.info(f"Download git with ssh_key:{git_url}")
git_ssh_cmd = f'ssh -i {ssh_key}'
with Git().custom_environment(GIT_SSH_COMMAND=git_ssh_cmd):
success, oss_version = download_git_repository(refs_to_checkout, git_url, target_dir, tag)
Expand Down