Wait. Can I only patch this file on Linux and not have to think about why it's breaking on Windows any longer?
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3175 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
parent
5cf59994f7
commit
2a987b6b2d
@ -83,7 +83,8 @@ def updateV8():
|
||||
if os.path.isdir(kV8Work):
|
||||
shutil.rmtree(kV8Work)
|
||||
|
||||
# XXX We modify one .py file which assumes invalid things.
|
||||
if sys.platform == 'linux2':
|
||||
# XXX Modify this one .py file which assumes things that conflict with my debian environment.
|
||||
if os.path.isfile(os.path.join(kV8Work, 'tools/swarming_client/third_party/requests/packages/urllib3/contrib/pyopenssl.py')):
|
||||
print 'resetting tools/swarming_client'
|
||||
print run(['git', 'checkout', '.'], cwd=os.path.join(kV8Work, 'tools', 'swarming_client'))
|
||||
@ -107,6 +108,7 @@ def updateV8():
|
||||
else:
|
||||
run(['gclient' + extension, 'sync'], cwd=kV8Work)
|
||||
|
||||
if sys.platform == 'linux2':
|
||||
contents = open(os.path.join(kV8Work, 'tools/swarming_client/third_party/requests/packages/urllib3/contrib/pyopenssl.py'), 'r').readlines()
|
||||
contents = [line for line in contents if not 'SSLv3' in line]
|
||||
open(os.path.join(kV8Work, 'tools/swarming_client/third_party/requests/packages/urllib3/contrib/pyopenssl.py'), 'w').write(''.join(contents))
|
||||
|
Loading…
Reference in New Issue
Block a user