Allow subproject dirs in subdirectories in the source tree again #2890
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
|
This should also have these: |
|
And path absoluteness should be checked with |
The previous change disallowed any subdirectories for subproject dirs, and therefore broke a couple of projects making use of that. This change still prevents people from setting subproject dirs that are not in the project's source tree, while allowing to specify any path within the project's directory again. Resolves: #2719
|
I was actually wondering why |
|
The |
This is important so people can not trick Meson to select a subproject_dir that is not in the project's source directory. It also ensures a string is used for the path.
|
Eeek, yes, I didn't think of that (and though that section was already in there). |
nirbheek
reviewed
Feb 9, 2018
| if spdirname.startswith('.'): | ||
| raise InterpreterException('Subproject_dir must not begin with a period.') | ||
| if '..' in spdirname: |
There was a problem hiding this comment.
Note: please use pathlib.PurePath().parts so that names like subprojects/some..dir/ don't fail this test.
This was referenced Feb 11, 2018
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.
The previous change disallowed any subdirectories for subproject dirs,
and therefore broke a couple of projects making use of that.
This change still prevents people from setting subproject dirs that are
not in the project's source tree, while allowing to specify any path
within the project's directory again.
This fixes the regression described in #2719