From 2a987b6b2d3e227ecf4f078797376f5b1161ec0e Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sun, 20 Mar 2016 14:00:11 +0000 Subject: [PATCH] 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 --- tools/update-deps | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/update-deps b/tools/update-deps index 31eb95e6..e294263b 100755 --- a/tools/update-deps +++ b/tools/update-deps @@ -83,10 +83,11 @@ def updateV8(): if os.path.isdir(kV8Work): shutil.rmtree(kV8Work) - # XXX We modify one .py file which assumes invalid things. - 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')) + 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')) extension = '' if sys.platform == 'win32': @@ -107,9 +108,10 @@ def updateV8(): else: run(['gclient' + extension, 'sync'], cwd=kV8Work) - 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)) + 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)) if sys.platform == 'linux2': run(['make', '-j4', 'native'], cwd=kV8Work)