Changeset 63748 in webkit

Timestamp:

Jul 20, 2010 9:30:41 AM (14 years ago)

Author:

tony@chromium.org

Message:

2010-07-20 Tony Chang <​tony@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

Location:

trunk/WebKitTools

Files:

• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Scripts/update-webkit-chromium (modified) (2 diffs)

trunk/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -66 +66 @@
     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
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-20  Tony Chang  <tony@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@apple.com>
 

trunk/WebKitTools/Scripts/update-webkit-chromium

@@ -30 +30 @@
 
 use File::Path;
+use Getopt::Long;
 
 chdir("WebKit/chromium") or die $!;
@@ -48 +49 @@
     # 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 $!;