Skip to content

Commit

Permalink
make file:// conditional on depth
Browse files Browse the repository at this point in the history
  • Loading branch information
bernt-matthias committed Jul 18, 2023
1 parent 54578f6 commit 7a00431
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion planemo/galaxy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ def _install_galaxy_via_download(ctx, galaxy_root, env, kwds):
def _install_galaxy_via_git(ctx, galaxy_root, env, kwds):
gx_repo = _ensure_galaxy_repository_available(ctx, kwds)
branch = _galaxy_branch(kwds)
command = git.command_clone(ctx, f"file://{gx_repo}", galaxy_root, branch=branch, depth=1)
command = git.command_clone(ctx, gx_repo, galaxy_root, branch=branch, depth=1)
exit_code = shell(command, env=env)
if exit_code != 0:
raise Exception("Failed to clone Galaxy via git")
Expand Down
10 changes: 9 additions & 1 deletion planemo/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import os
import subprocess
import urllib.parse
from typing import (
Dict,
List,
Expand Down Expand Up @@ -87,7 +88,12 @@ def checkout(ctx, remote_repo, local_path, branch=None, remote="origin", from_br


def command_clone(
ctx: "PlanemoCliContext", src: str, dest: str, mirror: bool = False, branch: Optional[str] = None, depth: Optional[int] = None
ctx: "PlanemoCliContext",
src: str,
dest: str,
mirror: bool = False,
branch: Optional[str] = None,
depth: Optional[int] = None
) -> List[str]:
"""Produce a command-line string to clone a repository.
Expand All @@ -100,6 +106,8 @@ def command_clone(
cmd.extend(["--branch", branch])
if depth is not None:
cmd.extend(["--depth", str(depth)])
if urllib.parse.urlparse(src).scheme == "":
src = f"file://{src}"
cmd.extend([src, dest])
return cmd

Expand Down

0 comments on commit 7a00431

Please sign in to comment.