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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d7a75a8162d3c8e264e5880ccd40e36cf56fcfcd
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 16:02:46 2011 +0000

    Build master fix
    
    * BuildSlaveSupport/build.webkit.org-config/master.cfg:
    (RunWebKitTests.start): Don't try to concatenate a list and a string.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75244 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 9139e31..5d0d6c0 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -204,7 +204,7 @@ class RunWebKitTests(shell.Test):
         platform = self.getProperty('platform')
         appendCustomBuildFlags(self, platform)
         if platform == "win":
-            rootArgument = ['--root='] + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")
+            rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
         else:
             rootArgument = ['--root=WebKitBuild/bin']
         if self.skipBuild:
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6e8cf87..69afbe2 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-07  Adam Roben  <aroben at apple.com>
+
+        Build master fix
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunWebKitTests.start): Don't try to concatenate a list and a string.
+
 2011-01-07  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
 
         Reviewed by Csaba Osztrogonác.

-- 
WebKit Debian packaging