From 6afd0c36e812d1fd6208c8261ebddbd80c145df4 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 18 Sep 2012 10:34:25 +0000 Subject: [PATCH] Do not assume gclient is in the PATH. Also specify the batch file on Windows. Python's subprocess is picky about that. TBR=rogerta@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/10939008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@157337 0039d316-1c4b-4281-b951-d872f2087c98 --- apply_issue.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apply_issue.py b/apply_issue.py index 3b3f1f4c1..8b50b37e5 100755 --- a/apply_issue.py +++ b/apply_issue.py @@ -22,6 +22,8 @@ import gclient_utils import rietveld import scm +BASE_DIR = os.path.dirname(os.path.abspath(__file__)) + def main(): parser = optparse.OptionParser(description=sys.modules[__name__].__doc__) @@ -119,8 +121,11 @@ def main(): 'A DEPS file was updated inside a gclient checkout, running gclient ' 'sync.') base_rev = 'BASE' if scm_type == 'svn' else 'HEAD' + gclient_path = os.path.join(BASE_DIR, 'gclient') + if sys.platform == 'win32': + gclient_path += '.bat' return subprocess.call( - ['gclient', 'sync', '--revision', base_rev], cwd=gclient_root) + [gclient_path, 'sync', '--revision', base_rev], cwd=gclient_root) return 0