shed_upload include with strip_components and '..' in paths#196
Merged
jmchilton merged 2 commits intogalaxyproject:masterfrom May 12, 2015
Merged
shed_upload include with strip_components and '..' in paths#196jmchilton merged 2 commits intogalaxyproject:masterfrom
jmchilton merged 2 commits intogalaxyproject:masterfrom
Conversation
Member
|
Wonderful @peterjc - this is great! I will do a new release with this today. |
jmchilton
added a commit
that referenced
this pull request
May 12, 2015
shed_upload include with strip_components and '..' in paths
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In order to handle include source paths combining
..andstrip_components, the path manipulation must be done before calculating relative paths (which drops the..entries). The easiest way to do this seemed to me to move all the path realisation out of theRealizedFileobject, thus the refactoring.(This is a corner case I missed while working on #185)
Motivating example peterjc/pico_galaxy@1029aa9 which wasn't working as expected.
i.e. With this
.shed.ymlinclude block:Before this fix:
With this fix:
Note: The test case may well be not quite as @jmchilton would write it - I was attempting to model it after the existing complex repository examples.