From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 18 May 2011 13:36:51 +0100
Subject: Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
---
 Tools/Scripts/update-webkit | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Tools/Scripts/update-webkit')

diff --git a/Tools/Scripts/update-webkit b/Tools/Scripts/update-webkit
index 6d3e0ee..aca56b8 100755
--- a/Tools/Scripts/update-webkit
+++ b/Tools/Scripts/update-webkit
@@ -50,9 +50,6 @@ determineIsChromium();
 
 chdirWebKit();
 
-my $isGit = isGit();
-my $isSVN = isSVN();
-
 my $getOptionsResult = GetOptions(
     'h|help'  => \$showHelp,
     'q|quiet' => \$quiet,
@@ -77,14 +74,14 @@ push @svnOptions, '-q' if $quiet;
 push @svnOptions, qw(--accept postpone) if isSVNVersion16OrNewer();
 
 print "Updating OpenSource\n" unless $quiet;
-runSvnUpdate() if $isSVN;
-runGitUpdate() if $isGit;
+runSvnUpdate() if isSVN();
+runGitUpdate() if isGit();
 
 if (-d "../Internal") {
     chdir("../Internal");
     print "Updating Internal\n" unless $quiet;
-    runSvnUpdate() if $isSVN;
-    runGitUpdate() if $isGit;
+    runSvnUpdate() if isSVN();
+    runGitUpdate() if isGit();
 } elsif (isChromium()) {
     # Workaround for https://bugs.webkit.org/show_bug.cgi?id=38926
     # We should remove the following "if" block when we find a right fix.
-- 
cgit v1.1