diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Tools/Scripts/update-webkit | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Tools/Scripts/update-webkit')
| -rwxr-xr-x | Tools/Scripts/update-webkit | 11 |
1 files changed, 4 insertions, 7 deletions
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. |