diff options
Diffstat (limited to 'rbtools/postreview.py')
-rwxr-xr-x | rbtools/postreview.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rbtools/postreview.py b/rbtools/postreview.py index 8fa8ce2..9f50f2c 100755 --- a/rbtools/postreview.py +++ b/rbtools/postreview.py @@ -1629,7 +1629,10 @@ class PerforceClient(SCMClient): Returns a list of strings of diff lines. """ - diff_cmd = ["diff", "-urNp", old_file, new_file] + if os.uname and os.uname()[0] == 'SunOS': + diff_cmd = ["gdiff", "-urNp", old_file, new_file] + else: + diff_cmd = ["diff", "-urNp", old_file, new_file] # Diff returns "1" if differences were found. dl = execute(diff_cmd, extra_ignore_errors=(1,2), translate_newlines=False) |