diff options
| author | eseidel@chromium.org <eseidel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 00:03:52 +0000 |
|---|---|---|
| committer | eseidel@chromium.org <eseidel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 00:03:52 +0000 |
| commit | 2c62d8690ae5d816ee194f8f675715165d3fb118 (patch) | |
| tree | 17cd18a473e298ba44625efa355197836088e531 | |
| parent | 627df9e4cd50bf2a14a5509efc12eba9cc373313 (diff) | |
| download | chromium_src-2c62d8690ae5d816ee194f8f675715165d3fb118.zip chromium_src-2c62d8690ae5d816ee194f8f675715165d3fb118.tar.gz chromium_src-2c62d8690ae5d816ee194f8f675715165d3fb118.tar.bz2 | |
fix the merge script to die on svn errors. Ojan reviewed.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8686 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | webkit/tools/merge/merge.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/tools/merge/merge.py b/webkit/tools/merge/merge.py index 613a324..a395a42 100755 --- a/webkit/tools/merge/merge.py +++ b/webkit/tools/merge/merge.py @@ -70,8 +70,9 @@ class Merger(object): command.append("--use-%s" % self._diff3_tool) print ' '.join(command) if not self._is_dry_run: - #TODO(ojan): Check return code here. - subprocess.call(command, cwd=self._webkit_root, shell=True) + returncode = subprocess.call(command, cwd=self._webkit_root, shell=True) + if returncode != 0: + raise "Are you sure you're running SVN 1.5? svn --version to check" def GetCurrentRepositoryAndRevision(webkit_merge_revision_path): """ Gets the repository and revision we're currently merged to according to @@ -129,8 +130,9 @@ def Sync(is_dry_run): if is_dry_run: print ' '.join(sync_command) else: - #TODO(ojan): Check return code here. - subprocess.call(sync_command, shell=True) + returncode = subprocess.call(sync_command, shell=True) + if returncode != 0: + raise "gclient sync failed, go beat darin with a squishy bat." def main(options, args): """ Does the merge and updates WEBKIT_MERGE_REVISION. |