Skip to content

Commit

Permalink
small fixes for sw install
Browse files Browse the repository at this point in the history
  • Loading branch information
mashehu committed Nov 3, 2022
1 parent efba890 commit d50d6a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion nf_core/modules/modules_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -401,14 +401,15 @@ def get_component_git_log(self, component_name, component_type, depth=None):
commits_new = [
{"git_sha": commit.hexsha, "trunc_message": commit.message.partition("\n")[0]} for commit in commits_new
]
commits_old = []
if component_type == "modules":
# Grab commits also from previous modules structure
component_path = os.path.join("modules", component_name)
commits_old = self.repo.iter_commits(max_count=depth, paths=component_path)
commits_old = [
{"git_sha": commit.hexsha, "trunc_message": commit.message.partition("\n")[0]} for commit in commits_old
]
commits = iter(commits_new + commits_old)
commits = iter(commits_new + commits_old)
return commits

def get_latest_component_version(self, component_name, component_type):
Expand Down
2 changes: 1 addition & 1 deletion nf_core/subworkflows/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def install(self, subworkflow, silent=False):
log.debug(f"Installing subworkflow '{subworkflow}' at hash {version} from {self.modules_repo.remote_url}")

# Download subworkflow files
if not self.install_subworkflow_files(subworkflow, version, self.modules_repo, install_folder):
if not self.install_component_files(subworkflow, version, self.modules_repo, install_folder):
return False

# Install included modules and subworkflows
Expand Down

0 comments on commit d50d6a1

Please sign in to comment.