From cb5b5b43f5b831d12ea4ed073eb72e9312c6185e Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 5 Nov 2013 20:27:00 +0000 Subject: [PATCH] Merge revision 1505 changes: - automate.py: Run update_depot_tools even if a depot-tools directory is specified on the command-line. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1507 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/automate/automate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/automate/automate.py b/tools/automate/automate.py index 83f380478..a0988c546 100644 --- a/tools/automate/automate.py +++ b/tools/automate/automate.py @@ -294,7 +294,7 @@ if not os.path.exists(depot_tools_dir): # checkout depot_tools run('svn checkout '+depot_tools_url+' '+depot_tools_dir, download_dir) -if not options.noupdate and options.depottools == '': +if not options.noupdate: # Update depot_tools. It will download required scripts (svn, python, ...) if platform == 'windows': run('update_depot_tools.bat', depot_tools_dir, depot_tools_dir);