[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7a74197888301c7f4d79fb1faea716752406e722
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 14:13:27 2010 +0000

    2010-01-22  Janusz Lewandowski  <lew21 at xtreeme.org>
    
            Reviewed by Maciej Stachowiak.
    
            run-webkit-tests fails on Ruby 1.9
            https://bugs.webkit.org/show_bug.cgi?id=33554
            inject does not work with strings any more, so BugsSite/PrettyPatch/PrettyPatch.rb prints lots of errors.
    
            * PrettyPatch/PrettyPatch.rb:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53700 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index 8afe156..ff23bc9 100644
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-22  Janusz Lewandowski  <lew21 at xtreeme.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        run-webkit-tests fails on Ruby 1.9
+        https://bugs.webkit.org/show_bug.cgi?id=33554
+        inject does not work with strings any more, so BugsSite/PrettyPatch/PrettyPatch.rb prints lots of errors.
+
+        * PrettyPatch/PrettyPatch.rb:
+
 2010-01-20  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Adam Barth.
diff --git a/BugsSite/PrettyPatch/PrettyPatch.rb b/BugsSite/PrettyPatch/PrettyPatch.rb
index b68cd8c..0b41104 100644
--- a/BugsSite/PrettyPatch/PrettyPatch.rb
+++ b/BugsSite/PrettyPatch/PrettyPatch.rb
@@ -294,16 +294,16 @@ EOF
 
         def self.parse(string)
             haveSeenDiffHeader = false
-            linesForDiffs = string.inject([]) do |diffChunks, line|
+            linesForDiffs = []
+            string.each_line do |line|
                 if (PrettyPatch.diff_header?(line))
-                    diffChunks << []
+                    linesForDiffs << []
                     haveSeenDiffHeader = true
                 elsif (!haveSeenDiffHeader && line =~ /^--- /)
-                    diffChunks << []
+                    linesForDiffs << []
                     haveSeenDiffHeader = false
                 end
-                diffChunks.last << line unless diffChunks.last.nil?
-                diffChunks
+                linesForDiffs.last << line unless linesForDiffs.last.nil?
             end
 
             linesForDiffs.collect { |lines| FileDiff.new(lines) }

-- 
WebKit Debian packaging