Fix uploads of link-only datasets to data library #5917
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nsoranzo
reviewed
Apr 19, 2018
tools/data_source/upload.py
Outdated
| @@ -175,7 +175,7 @@ def add_file(dataset, registry, output_path): | |||
| stdout = ("The uploaded binary file format cannot be determined automatically, please set the file 'Type'" | |||
| " manually") | |||
|
|
|||
| datatype = registry.get_datatype_by_extension(ext) | |||
| datatype = registry.get_datatype_by_extension(ext or dataset.file_type) | |||
There was a problem hiding this comment.
Or we can add:
else:
ext = dataset.file_type
after line 151, so ext is always set after that block.
`ext` was never being set in the case of link only datasets, where I think the right thing is to fall back on `dataset.file_type`. Fixes galaxyproject#5915.
since it is being used again later. Thanks @nsoranzo!
mvdbeek
force-pushed
the
fix_link_only_add_datasets
branch
from
1f8617d
to
2e18ed2
Compare
nsoranzo
approved these changes
Apr 19, 2018
|
thanks guys! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
extwas never being set in the case of link only datasets, where I think theright thing is to fall back on
dataset.file_type.Fixes #5915.