[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0404192af9206e5c65e9c1afcb8222897f54ae53
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 23:39:59 2009 +0000

    2009-11-27  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            style-queue should only process each patch once
            https://bugs.webkit.org/show_bug.cgi?id=31939
    
            Actually address reviewer comments!
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b34fc7..6dd2d6b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Eric Seidel.
 
+        style-queue should only process each patch once
+        https://bugs.webkit.org/show_bug.cgi?id=31939
+
+        Actually address reviewer comments!
+
+        * Scripts/bugzilla-tool:
+
+2009-11-27  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [bzt] style-queue fails to apply a bunch of patches for no reason
         https://bugs.webkit.org/show_bug.cgi?id=31942
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index ba32b3a..736f11c 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -46,8 +46,8 @@ class BugzillaTool(MultiCommandTool):
 
         self.bugs = Bugzilla()
         self.buildbot = BuildBot()
-        self._cached_scm = None
-        self._cached_status = None
+        self._scm = None
+        self._status = None
         self.steps = BuildSteps()
 
     def dry_run_callback(self, option, opt, value, parser):
@@ -57,24 +57,24 @@ class BugzillaTool(MultiCommandTool):
     def scm(self):
         # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
         original_cwd = os.path.abspath(".")
-        if not self._cached_scm:
-            self._cached_scm = detect_scm_system(original_cwd)
+        if not self._scm:
+            self._scm = detect_scm_system(original_cwd)
 
-        if not self._cached_scm:
+        if not self._scm:
             script_directory = os.path.abspath(sys.path[0])
             webkit_directory = os.path.abspath(os.path.join(script_directory, "../.."))
-            self._cached_scm = detect_scm_system(webkit_directory)
-            if self._cached_scm:
+            self._scm = detect_scm_system(webkit_directory)
+            if self._scm:
                 log("The current directory (%s) is not a WebKit checkout, using %s" % (original_cwd, webkit_directory))
             else:
                 error("FATAL: Failed to determine the SCM system for either %s or %s" % (original_cwd, webkit_directory))
 
-        return self._cached_scm
+        return self._scm
 
     def status(self):
-        if not self._cached_status:
-            self._cached_status = StatusBot()
-        return self._cached_status
+        if not self._status:
+            self._status = StatusBot()
+        return self._status
 
     def path(self):
         return __file__

-- 
WebKit Debian packaging