Use the subrepo's FS for reading config and globbing #2960
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
Tatskaari
changed the title
samwestmoreland
approved these changes
Nov 15, 2023
src/core/state.go
Outdated
| @@ -255,7 +255,7 @@ func (state *BuildState) Initialise(subrepo *Subrepo) (err error) { | |||
| // handled for us already in plz.go | |||
| if state.CurrentSubrepo != "" { | |||
| state.RepoConfig = &Configuration{} | |||
| err = readConfigFilesInto(state.RepoConfig, append(subrepo.AdditionalConfigFiles, filepath.Join(subrepo.Root, ".plzconfig"))) | |||
| err = readSubrepoConfig(state.RepoConfig, subrepo) | |||
There was a problem hiding this comment.
nit: Could we do an if err here?
|
Oh looks like globbing might have broken? Getting a nil pointer dereference somwhere |
We were creating a dirfs from the string "" for architecture subrepos. This is explicitly not allowed by the documentation. I think we just need to handle this in the subrepo constructor. |
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.
No description provided.