From af08d3f286e1859a77a918fd61f7138564380116 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Wed, 27 Aug 2014 09:54:03 +0000 Subject: [PATCH] Fix chromium sync command in auto-roller. TBR=hinoka@chromium.org, jarin@chromium.org Review URL: https://codereview.chromium.org/506273007 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23443 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/chromium_roll.py | 2 +- tools/push-to-trunk/test_scripts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py index 6b00429..fe389ef 100755 --- a/tools/push-to-trunk/chromium_roll.py +++ b/tools/push-to-trunk/chromium_roll.py @@ -72,7 +72,7 @@ class UpdateChromiumCheckout(Step): def RunStep(self): os.chdir(self["chrome_path"]) self.GitCheckout("master") - self._side_effect_handler.Command("gclient", "sync --no-hooks") + self._side_effect_handler.Command("gclient", "sync --nohooks") self.GitCreateBranch("v8-roll-%s" % self["trunk_revision"]) diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 4b36ba9..5dcc796 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -854,7 +854,7 @@ def get_list(): "Version 3.22.5 (based on bleeding_edge revision r123454)\n"), Git("status -s -uno", ""), Git("checkout -f master", ""), - Git("sync --no-hooks", "syncing..."), + Git("sync --nohooks", "syncing..."), Git("checkout -b v8-roll-123455", ""), Git("v8 123455", "rolled", cb=WriteDeps), Git(("commit -am \"Update V8 to version 3.22.5 " -- 2.7.4