diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-10 14:16:23 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-10 14:16:23 +0000 |
| commit | cc5fd0a95a2d4bed75179b578e854a15a72f7027 (patch) | |
| tree | 36ec95a03c021553bf7ec06a1aad8f3cbb4f2e5d /tools | |
| parent | b295fb6ff3222453912dfcb7a1ea5184d40014b5 (diff) | |
Use the modified path, not the original path for the platform prefix.
Fixes regression introduced in r11642.
git-svn-id: http://skia.googlecode.com/svn/trunk@11693 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/svndiff.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/svndiff.py b/tools/svndiff.py index 196eace52e..4f9618512a 100755 --- a/tools/svndiff.py +++ b/tools/svndiff.py @@ -261,9 +261,9 @@ def SvnDiff(path_to_skdiff, dest_dir, source_dir): else: _GitExportBaseVersionOfFile( modified_file_path, original_file.name) - original_directory = os.path.dirname(original_file.name) + modified_dir = os.path.dirname(modified_file_path) platform_prefix = (re.sub(re.escape(os.sep), '__', - os.path.splitdrive(original_directory)[1]) + os.path.splitdrive(modified_dir)[1]) + '__') _CallJsonDiff(old_json_path=original_file.name, new_json_path=modified_file_path, |