[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 13:32:22 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4373e04d70487126bb0406b7e805dfdaa8972f5e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 19 01:21:13 2010 +0000

    2010-09-18  Prasad Tammana  <prasadt at chromium.org>
    
            Reviewed by David Levin.
    
            update-webkit --chromium spitting out a spurious error
            https://bugs.webkit.org/show_bug.cgi?id=45868
    
            * Scripts/update-webkit-chromium: Use commandExists() function to check for existence of gclient.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67806 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ebd908f..1fee8ee 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-18  Prasad Tammana  <prasadt at chromium.org>
+
+        Reviewed by David Levin.
+
+        update-webkit --chromium spitting out a spurious error
+        https://bugs.webkit.org/show_bug.cgi?id=45868
+
+        * Scripts/update-webkit-chromium: Use commandExists() function to check for existence of gclient.
+
 2010-09-18  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitTools/Scripts/update-webkit-chromium b/WebKitTools/Scripts/update-webkit-chromium
index 8458f83..1db1826 100755
--- a/WebKitTools/Scripts/update-webkit-chromium
+++ b/WebKitTools/Scripts/update-webkit-chromium
@@ -29,13 +29,16 @@
 # Update script for the WebKit Chromium Port.
 
 use File::Path;
+use FindBin;
 use Getopt::Long;
+use lib $FindBin::Bin;
+use webkitdirs;
 
 chdir("WebKit/chromium") or die $!;
 
 # Find gclient or install it.
 my $gclientPath;
-if (`gclient --version`) {
+if (commandExists('gclient')) {
     $gclientPath = 'gclient';
 } elsif (-e 'depot_tools/gclient') {
     $gclientPath = 'depot_tools/gclient';

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list