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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 91eca3097984a6372ce7e470b2e0387bac7f7d26
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 04:58:10 2010 +0000

    2010-01-07  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            webkit-patch edit-changelogs (or upload) will open blank files if run outside the root
            https://bugs.webkit.org/show_bug.cgi?id=33341
    
            Fix this by moving to the root directory before editing ChangeLogs.
            There is a related bug with CheckStyle.
    
            * Scripts/webkitpy/steps/checkstyle.py:
            * Scripts/webkitpy/steps/editchangelog.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 80a280f..1438d8e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        webkit-patch edit-changelogs (or upload) will open blank files if run outside the root
+        https://bugs.webkit.org/show_bug.cgi?id=33341
+
+        Fix this by moving to the root directory before editing ChangeLogs.
+        There is a related bug with CheckStyle.
+
+        * Scripts/webkitpy/steps/checkstyle.py:
+        * Scripts/webkitpy/steps/editchangelog.py:
+
 2010-01-07  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebKitTools/Scripts/webkitpy/steps/checkstyle.py b/WebKitTools/Scripts/webkitpy/steps/checkstyle.py
index 0e06585..c8e20f8 100644
--- a/WebKitTools/Scripts/webkitpy/steps/checkstyle.py
+++ b/WebKitTools/Scripts/webkitpy/steps/checkstyle.py
@@ -26,6 +26,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
+
 from webkitpy.executive import ScriptError
 from webkitpy.steps.abstractstep import AbstractStep
 from webkitpy.steps.options import Options
@@ -42,6 +44,7 @@ class CheckStyle(AbstractStep):
     def run(self, state):
         if not self._options.check_style:
             return
+        os.chdir(self._tool.scm().checkout_root)
         try:
             self._run_script("check-webkit-style")
         except ScriptError, e:
diff --git a/WebKitTools/Scripts/webkitpy/steps/editchangelog.py b/WebKitTools/Scripts/webkitpy/steps/editchangelog.py
index bdf7d67..d545c72 100644
--- a/WebKitTools/Scripts/webkitpy/steps/editchangelog.py
+++ b/WebKitTools/Scripts/webkitpy/steps/editchangelog.py
@@ -26,9 +26,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
+
 from webkitpy.steps.abstractstep import AbstractStep
 
 
 class EditChangeLog(AbstractStep):
     def run(self, state):
+        os.chdir(self._tool.scm().checkout_root)
         self._tool.user.edit(self.cached_lookup(state, "changelogs"))

-- 
WebKit Debian packaging