Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1493510 [wpt PR 13177] - Check if platform is Windows before catching WindowsError, a=testonly

Browse Source 
Automatic update from web-platform-testsCheck if platform is Windows before catching WindowsError

Check if the platform is Windows and the error is a WindowsError before
trying to run git.bat, as WindowsError is not defined in non-Windows.

Closes https://github.com/web-platform-tests/wpt/issues/12693

--

wpt-commits: 82d852bda1e08948858389c17402fa0571bc2584
wpt-pr: 13177
This commit is contained in:
Ahilya Sinha 2018-09-26 10:47:19 +00:00 committed by moz-wptsync-bot
parent 51766e943f
commit 7da39973f5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/web-platform/tests/tools/manifest/vcs.py
View File

@ -1,5 +1,6 @@
import os
import subprocess
import platform
from .sourcefile import SourceFile
@ -16,9 +17,12 @@ class Git(object):
full_cmd = ["git", cmd] + list(args)
try:
return subprocess.check_output(full_cmd, cwd=repo_path, stderr=subprocess.STDOUT)
except WindowsError:
full_cmd[0] = "git.bat"
return subprocess.check_output(full_cmd, cwd=repo_path, stderr=subprocess.STDOUT)
except Exception as e:
if platform.uname()[0] == "Windows" and isinstance(e, WindowsError):
full_cmd[0] = "git.bat"
return subprocess.check_output(full_cmd, cwd=repo_path, stderr=subprocess.STDOUT)
else:
raise
return git
@classmethod