fix: use bundled filename to fix common pb includes #1860
Merged
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.
Upgrading from 6.7 to 7.0, we ran into the following issue, using the CLI: If the
.proto
files given as arguments contain somegoogle/protobuf/*.proto
files, as well asimport
statements importing them in other files, the CLI command terminates with error "duplicate name '..' in Namespace .google.protobuf". Basically it didn't recognize that a common file had already been fetched and parsed. Interestingly this only happened if we used the absolute paths of the.proto
files.We found that enforcing the use of the bundled filename in the
fetch
function fixes the issue, and this PR does just that. In an older version the bundled filename was used here, but it was dropped in this commit. Note that after that commit, the bundled filename is used only when fetching imports.This PR does not depend on my previous PR.