Don't break when data-dir is null.#5319
Merged
phadej merged 1 commit intohaskell:masterfrom May 19, 2018
Merged
Conversation
quasicomputational
force-pushed
the
fix-5318
branch
2 times, most recently
from
c8af0a4 to
bfe6d15
Compare
PR haskell#5284 changed things around, and now matchDirFileGlob will break if it's passed a null directory, which happens to be the default value for data-dir. Its call sites have been fixed to check for this and to substitute '.' for an empty path, which is the desired behaviour; in addition, matchDirFileGlob itself will now warn about this if it's detected, so that new broken call sites can't sneak in. Fixes haskell#5318.
quasicomputational
force-pushed
the
fix-5318
branch
from
bfe6d15 to
f25130c
Compare
Contributor
Author
|
The 7.10 build on Travis failing due to OOM is also happening on master, and seems to have started with 6597b13... which really shouldn't've changed anything. Most likely transient Travis flakiness, and definitely not due to this PR. |
phadej
approved these changes
May 19, 2018
Collaborator
phadej
left a comment
phadej
left a comment
There was a problem hiding this comment.
Test-case seems reasonable. And I guess someone have used it locally already. Let's merge this.
Collaborator
|
ok now there is I think I can fix that. Will do another PR for that. |
phadej
added a commit
to phadej/cabal
that referenced
this pull request
May 19, 2018
23Skidoo
pushed a commit
that referenced
this pull request
May 24, 2018
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.
PR #5284 changed things around, and now matchDirFileGlob will break if
it's passed a null directory, which happens to be the default value
for data-dir. Its call sites have been fixed to check for this and to
substitute '.' for an empty path, which is the desired behaviour; in
addition, matchDirFileGlob itself will now warn about this if it's
detected, so that new broken call sites can't sneak in.
Fixes #5318.
Please include the following checklist in your PR:
[ci skip]is used to avoid triggering the build bots.Please also shortly describe how you tested your change. Bonus points for added tests!