Attempt to run 'protoc' without a prefix if one isn't found.#691
Merged
Kenadia merged 1 commit intogoogle:masterfrom Jan 10, 2018
charlesnicholson:relax-protoc
Merged
Attempt to run 'protoc' without a prefix if one isn't found.#691Kenadia merged 1 commit intogoogle:masterfrom charlesnicholson:relax-protoc
Kenadia merged 1 commit intogoogle:masterfrom
charlesnicholson:relax-protoc
Conversation
…attempt to just invoke it without any prefix path. This preserves the existing behavior, but also allows control of the specific protoc by manipulating the path beforehand.
Contributor
Author
|
@wallacbe FYI |
grybmadsci
approved these changes
Jan 7, 2018
wallacbe
approved these changes
Jan 8, 2018
|
This OK to merge? |
Contributor
|
LGTM too. Also tried it and it works for me (mac) |
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
4 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.
If protoc isn't found via pkg-config or at the hard-coded locations, attempt to just invoke it without any prefix path. This allows for protobuf to be sandboxed (in a git repository, for example).
This change preserves the existing behavior by explicitly preferring '/usr/bin/protoc' on Linux and '/usr/local/bin/protoc' on OSX, but also allows control of the specific protoc by manipulating the path beforehand.
Fix a Python3 bug, convert subprocess.check_output to a string and append standard (non-byte) strings to it. This is redundant but functional in Python2.