Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py |
index 442beec09516abe332d8941f293749acf2ca422e..cbfcae51dabdb5674ec2f278d9e01308c25fa3a0 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py |
@@ -430,8 +430,6 @@ class DirMerger(Merger): |
def merge(self, output_dir, to_merge_dirs): |
output_dir = self.filesystem.realpath(self.filesystem.abspath(output_dir)) |
- if self.filesystem.exists(output_dir): |
- raise OSError("Output directory %s exists." % output_dir) |
merge_dirs = [] |
# Normalize the given directory values. |
@@ -466,8 +464,8 @@ class DirMerger(Merger): |
for partial_file_path, in_dirs in sorted(files.iteritems()): |
out_path = self.filesystem.join(output_dir, partial_file_path) |
if self.filesystem.exists(out_path): |
- raise MergeFailure('File %s already exist in output.' % ( |
- out_path)) |
+ raise MergeFailure( |
+ 'File %s already exist in output.', out_path, None, None) |
dirname = self.filesystem.dirname(out_path) |
if not self.filesystem.exists(dirname): |