Skip to content
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

Detect pathmapper name conflicts. #805

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Detect pathmapper name conflicts. #805

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c6598eb
Detect pathmapper name conflicts.
Jul 1, 2018
e272a28
Fix type annotation
Jul 1, 2018
a935a04
Merge branch 'main' into name-conflict-error
mr-c Jul 2, 2020
ab858ed
Merge branch 'main' into name-conflict-error
mergify[bot] Dec 3, 2020
0074471
Merge branch 'main' into name-conflict-error
mergify[bot] Dec 3, 2020
fe72965
Merge remote-tracking branch 'origin/main' into name-conflict-error
mr-c Sep 5, 2021
476952d
fix formatting
mr-c Sep 5, 2021
5a7d5cb
Merge branch 'main' into name-conflict-error
mr-c Jan 6, 2022
454964a
Merge branch 'main' into name-conflict-error
mr-c May 4, 2022
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
10 changes: 10 additions & 0 deletions cwltool/pathmapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@ def setup(self, referenced_files: List[CWLObjectType], basedir: str) -> None:
staged=True,
)

targets: Dict[str, str] = {}
for k, v in self._pathmap.items():
if v.target in targets:
raise ValidationException(
"Name conflict: both %s and %s have been assigned to target %s"
% (k, targets[v.target], v.target)
)
if v.type != "Directory":
targets[v.target] = k

def mapper(self, src: str) -> MapperEnt:
if "#" in src:
i = src.index("#")
Expand Down