AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Allow generate_py_protobufs to find a custom protoc (#7936)

Browse Source 
Currently, the logic in `generate_py_protobufs` cannot find a custom `protoc` (even though it's supposed to be possible). Fixes:

1. Mark the `--protoc` flag as accepting an argument.
2. If the `--protoc` flag was not passed, try finding `PROTOC` in the environment.
3. (Existing behavior) Otherwise, fall back to `spawn.find_executable`.

Hat tip to @bobhancock for uncovering the problem(s).
This commit is contained in:
David L. Jones 2020-10-01 17:17:55 -07:00 committed by GitHub
parent 54bfa174e7
commit 344f28d4a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/protobuf_distutils/protobuf_distutils/generate_py_protobufs.py
View File

@ -47,7 +47,7 @@ class generate_py_protobufs(Command):
('extra-proto-paths=', None,
'Additional paths to resolve imports in .proto files.'),
('protoc', None,
('protoc=', None,
'Path to a specific `protoc` command to use.'),
]
boolean_options = ['recurse']
@ -127,6 +127,8 @@ class generate_py_protobufs(Command):
self.ensure_string_list('proto_files')
if self.protoc is None:
self.protoc = os.getenv('PROTOC')
if self.protoc is None:
self.protoc = spawn.find_executable('protoc')