[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

vestbo at webkit.org vestbo at webkit.org
Thu Oct 29 20:38:54 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit f7bb21e00a438892f67ea0c0500d4e2fa89424b8
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 10:48:57 2009 +0000

    Pass arguments to system() as a string instead of array
    
    Reviewed by Ariya Hidayat.
    
    When passed as an array entries with a space fail to translate
    to two arguments to the child process, so instead of manually
    splitting all the entries in @buildArgs we pass the whole thing
    as a string instead.
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49088 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8ff9f43..880a814 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-05  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Ariyha Hidayat.
+
+        Pass arguments to system() as a string instead of array
+
+        When passed as an array entries with a space fail to translate
+        to two arguments to the child process, so instead of manually
+        splitting all the entries in @buildArgs we pass the whole thing
+        as a string instead.
+
+        * Scripts/webkitdirs.pm:
+
 2009-10-04  Carol Szabo  <carol.szabo at nokia.com>
 
         Reviewed by David Levin.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 7653d76..d5177dd 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1337,7 +1337,7 @@ sub buildQMakeProject($@)
     print "Calling '$qmakebin @buildArgs' in " . $dir . "\n\n";
     print "Installation directory: $prefix\n" if(defined($prefix));
 
-    my $result = system $qmakebin, @buildArgs;
+    my $result = system "$qmakebin @buildArgs";
     if ($result ne 0) {
        die "Failed to setup build environment using $qmakebin!\n";
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list