[v9] Fix broken version check in tbot's tshwrap
(#13034)
#13037
Merged
+15
−8
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.
Backport of #13034 for branch/v9.
tshwrap
performs a tsh version check to ensure it has the functionality we need. Unfortunately, during a final refactoring before merging, we changed the function signature ofcapture()
to require an explicit path to atsh
binary but in a way that was unfortunately not caught by the compiler. The previous syntax meant we just tried to execute the first argument, i.e.version
, which is never what we want.This PR correctly passes the tsh path to
capture()
to fix the version check.