[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 617a6ce643878ca23e809d55b21eb9e2aa9a39f5
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 20:40:19 2011 +0000

    2011-01-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Simon Fraser.
    
            webkit-patch shouldn't waste time cleaning a working directory that's already clean
            https://bugs.webkit.org/show_bug.cgi?id=51840
    
            * Scripts/webkitpy/common/checkout/scm.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6b8523c..4f98a10 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Simon Fraser.
 
+        webkit-patch shouldn't waste time cleaning a working directory that's already clean
+        https://bugs.webkit.org/show_bug.cgi?id=51840
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
+2011-01-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Simon Fraser.
+
         webkit-patch should only hide update output if --quiet
         https://bugs.webkit.org/show_bug.cgi?id=51838
 
diff --git a/Tools/Scripts/webkitpy/common/checkout/scm.py b/Tools/Scripts/webkitpy/common/checkout/scm.py
index c54fb42..3f77043 100644
--- a/Tools/Scripts/webkitpy/common/checkout/scm.py
+++ b/Tools/Scripts/webkitpy/common/checkout/scm.py
@@ -172,14 +172,15 @@ class SCM:
         return os.path.join(self.scripts_directory(), script_name)
 
     def ensure_clean_working_directory(self, force_clean):
-        if not force_clean and not self.working_directory_is_clean():
+        if self.working_directory_is_clean():
+            return
+        if not force_clean:
             # FIXME: Shouldn't this use cwd=self.checkout_root?
             print self.run(self.status_command(), error_handler=Executive.ignore_error)
             raise ScriptError(message="Working directory has modifications, pass --force-clean or --no-clean to continue.")
-        
         log("Cleaning working directory")
         self.clean_working_directory()
-    
+
     def ensure_no_local_commits(self, force):
         if not self.supports_local_commits():
             return

-- 
WebKit Debian packaging