summaryrefslogtreecommitdiffstats
path: root/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py')
-rw-r--r--WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py b/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py
index 7b2be99..93e6215 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py
@@ -48,16 +48,17 @@ class CheckStyle(AbstractStep):
if not self._options.check_style:
return
os.chdir(self._tool.scm().checkout_root)
- try:
- args = []
- if self._options.git_commit:
- args.append("--git-commit")
- args.append(self._options.git_commit)
- if self._tool.scm().should_squash(self._options.squash):
- args.append("--squash")
- else:
- args.append("--no-squash")
+ args = []
+ if self._options.git_commit:
+ args.append("--git-commit")
+ args.append(self._options.git_commit)
+ if self._tool.scm().should_squash(self._options.squash):
+ args.append("--squash")
+ else:
+ args.append("--no-squash")
+
+ try:
self._run_script("check-webkit-style", args)
except ScriptError, e:
if self._options.non_interactive: