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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 31794489dca6fab03605dbfceb6c290a51752920
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 16:30:41 2010 +0000

    2010-07-20  Tony Chang  <tony at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] only pass --force to gclient sync if explicitly stated
            https://bugs.webkit.org/show_bug.cgi?id=42581
    
            * BuildSlaveSupport/build.webkit.org-config/master.cfg: bots should
                  always pass --force since it's hard to do manual cleanups
            * Scripts/update-webkit-chromium: only pass --force if --force is
                  passed in
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 5b5d819..e1eaa71 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -65,7 +65,7 @@ class InstallChromiumDependencies(shell.ShellCommand):
     name = "gclient"
     description = ["updating chromium dependencies"]
     descriptionDone = ["updated chromium dependencies"]
-    command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium"]
+    command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium", "--force"]
     haltOnFailure = True
 
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d020ccb..4c5b806 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-20  Tony Chang  <tony at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] only pass --force to gclient sync if explicitly stated
+        https://bugs.webkit.org/show_bug.cgi?id=42581
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg: bots should
+              always pass --force since it's hard to do manual cleanups
+        * Scripts/update-webkit-chromium: only pass --force if --force is
+              passed in
+
 2010-07-19  Anders Carlsson  <andersca at apple.com>
 
         Fix build.
diff --git a/WebKitTools/Scripts/update-webkit-chromium b/WebKitTools/Scripts/update-webkit-chromium
index 836e30e..8458f83 100755
--- a/WebKitTools/Scripts/update-webkit-chromium
+++ b/WebKitTools/Scripts/update-webkit-chromium
@@ -29,6 +29,7 @@
 # Update script for the WebKit Chromium Port.
 
 use File::Path;
+use Getopt::Long;
 
 chdir("WebKit/chromium") or die $!;
 
@@ -47,11 +48,18 @@ if (`gclient --version`) {
 if (! -e ".gclient") {
     # If .gclient configuration file doesn't exist, create it.
     print "Configuring gclient...\n";
-    system($gclientPath, 
+    system($gclientPath,
            "config", 
            "--spec=solutions=[{'name':'./','url':None}]") == 0 or die $!;
 }
 
+my $force = 0;
+GetOptions(
+  'force' => \$force,
+);
+
 # Execute gclient sync.
 print "Updating chromium port dependencies using gclient...\n";
-system($gclientPath, "sync", "--force") == 0 or die $!;
+my @gclientArgs = ($gclientPath, "sync");
+push @gclientArgs, "--force" if $force;
+system(@gclientArgs) == 0 or die $!;

-- 
WebKit Debian packaging