From 28974d096c1cce3d996dc4db68634ecfa9b7967c Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 22 Aug 2013 19:31:53 +0000 Subject: [PATCH] Windows: Always use the depot_tools SVN version instead of the system SVN version. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1398 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/automate/automate.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/automate/automate.py b/tools/automate/automate.py index ba3bfd145..48425cfae 100644 --- a/tools/automate/automate.py +++ b/tools/automate/automate.py @@ -50,7 +50,7 @@ def get_svn_info(path): try: if sys.platform == 'win32': # Force use of the SVN version bundled with depot_tools. - svn = 'svn.bat' + svn = os.path.join(depot_tools_dir, 'svn.bat') else: svn = 'svn' (stream_in, stream_out, stream_err) = os.popen3(svn+' info --xml '+path) @@ -262,9 +262,6 @@ if not os.path.exists(depot_tools_dir): # checkout depot_tools run('svn checkout '+depot_tools_url+' '+depot_tools_dir, download_dir) -# Add depot_tools to the system path -sys.path.insert(1, depot_tools_dir) - if not options.url is None: # set the CEF URL cef_url = check_url(options.url)