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

laszlo.1.gombos at nokia.com laszlo.1.gombos at nokia.com
Fri Jan 21 14:54:46 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 44790496507aa18b9bbad2c60ecea9b8a7516e55
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 18:53:35 2011 +0000

    2011-01-04  Dihan Wickremasuriya  <dihan.wickremasuriya at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] [Symbian] Do not remove 0 byte sized files from productDir
    
            On Symbian productDir points to the source directory. Removing all the
            empty files from the productDir directory corrupts the svn repository.
    
            * Scripts/build-webkit:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 90096b0..2327c54 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-04  Dihan Wickremasuriya  <dihan.wickremasuriya at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] [Symbian] Do not remove 0 byte sized files from productDir
+
+        On Symbian productDir points to the source directory. Removing all the
+        empty files from the productDir directory corrupts the svn repository.
+
+        * Scripts/build-webkit:
+
 2011-01-03  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Adam Barth.
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 6571df7..7e8fa0a 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -353,7 +353,7 @@ setConfiguration();
 my $productDir = productDir();
 
 # Remove 0 byte sized files from productDir after slave lost for Qt buildbots.
-File::Find::find(\&unlinkZeroFiles, $productDir) if (isQt() && -e $productDir);
+File::Find::find(\&unlinkZeroFiles, $productDir) if (isQt() && !isSymbian() && -e $productDir);
 
 sub unlinkZeroFiles ()
 {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list