Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix git not found error on Windows when running gclient (#728) 

It happens if `git` is not installed as a standard alone application, but as a shell command.

Fixes #724.
This commit is contained in:
Abhay Sundaram 2020-03-13 21:52:12 +05:30 committed by GitHub
parent c576814d30
commit 28537034e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packager/version/generate_version_string.py
View File

@ -32,8 +32,8 @@ if 'check_output' not in dir(subprocess):
if __name__ == '__main__': if __name__ == '__main__':
try: try:
version_tag = subprocess.check_output( version_tag = subprocess.check_output(
['git', 'tag', '--points-at', 'HEAD'], 'git tag --points-at HEAD',
stderr=subprocess.STDOUT).rstrip() stderr=subprocess.STDOUT, shell=True).rstrip()
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
# git tag --points-at is not supported in old versions of git. Just ignore # git tag --points-at is not supported in old versions of git. Just ignore
# version_tag in this case. # version_tag in this case.
@ -41,8 +41,8 @@ if __name__ == '__main__':
try: try:
version_hash = subprocess.check_output( version_hash = subprocess.check_output(
['git', 'rev-parse', '--short', 'HEAD'], 'git rev-parse --short HEAD',
stderr=subprocess.STDOUT).rstrip() stderr=subprocess.STDOUT, shell=True).rstrip()
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
version_hash = 'unknown-version' version_hash = 'unknown-version'