2009-11-16 Eric Seidel <eric@webkit.org>
[WebKit-https.git] / WebKitTools / Scripts / bugzilla-tool
index 192ca3e128c2541f7d99e7c0930356195a2d73da..26ab7625ac4a131dd0fa2bc302c3a3467314b642 100755 (executable)
@@ -152,7 +152,9 @@ class CheckStyleOnBug(Command):
             log("Patch failed to apply and check style")
             log(e.output)
 
-        tool.scm().ensure_clean_working_directory(True)
+        # This is safe because in order to get here the working directory had to be
+        # clean at the beginning.  Clean it out again before we exit.
+        tool.scm().ensure_clean_working_directory(force_clean=True)
 
     def execute(self, options, args, tool):
         bug_id = args[0]
@@ -280,7 +282,7 @@ class WebKitLandingScripts:
         os.chdir(scm.checkout_root)
         scm.ensure_no_local_commits(options.force_clean)
         if options.clean:
-            scm.ensure_clean_working_directory(options.force_clean)
+            scm.ensure_clean_working_directory(force_clean=options.force_clean)
 
     @classmethod
     def build_and_commit(cls, scm, options):