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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2649ea548c4ffa927483e484c6434f6ae3a5165b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 30 01:46:26 2009 +0000

    2009-09-29  Yaar Schnitman  <yaar at chromium.org>
    
            Reviewed by David Kilzer.
    
            Fixed how error codes are handled.
            https://bugs.webkit.org/show_bug.cgi?id=29898
    
            * Scripts/update-webkit:
            * Scripts/update-webkit-chromium:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48916 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6caf655..bfd0a74 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-29  Yaar Schnitman  <yaar at chromium.org>
+
+        Reviewed by David Kilzer.
+
+        Fixed how error codes are handled.
+        https://bugs.webkit.org/show_bug.cgi?id=29898
+
+        * Scripts/update-webkit:
+        * Scripts/update-webkit-chromium:
+
 2009-09-29  Brady Eidson  <beidson at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKitTools/Scripts/update-webkit b/WebKitTools/Scripts/update-webkit
index 8f2d6b1..e562cc0 100755
--- a/WebKitTools/Scripts/update-webkit
+++ b/WebKitTools/Scripts/update-webkit
@@ -77,7 +77,7 @@ if (-d "../Internal") {
     print "Updating Internal\n" unless $quiet;
     runSvnUpdate();
 } elsif (isChromium()) {
-    system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die;
+    system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die $!;
 } elsif (isAppleWinWebKit()) {
     system("perl", "WebKitTools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
 }
diff --git a/WebKitTools/Scripts/update-webkit-chromium b/WebKitTools/Scripts/update-webkit-chromium
index cfd413f..a0cc19a 100644
--- a/WebKitTools/Scripts/update-webkit-chromium
+++ b/WebKitTools/Scripts/update-webkit-chromium
@@ -37,18 +37,15 @@ if (not `gclient --version`) {
     die;
 }
 
-# If .gclient configuration file doesn't exist, create it.
 chdir("WebKit/chromium") or die $!;
 if (! -e ".gclient") {
+    # If .gclient configuration file doesn't exist, create it.
     print "Configuring gclient...\n";
-    my $result = exec("gclient", 
-                        "config", 
-                        "--spec=solutions=[{'name':'./','url':None}]");
-    if (!$result) {
-        die "Error while configuring gclient for chromium port\n";
-    }
+    system("gclient", 
+           "config", 
+           "--spec=solutions=[{'name':'./','url':None}]") == 0 or die $!;
 }
 
 # Execute gclient sync.
 print "Updating chromium port dependencies using gclient...\n";
-exec("gclient", "sync") == 0 or die;
+system("gclient", "sync") == 0 or die $!;

-- 
WebKit Debian packaging