summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchipx86 <chipx86@5efc13c4-1f27-0410-8691-ff2d1f55687e>2009-08-22 10:46:45 +0000
committerchipx86 <chipx86@5efc13c4-1f27-0410-8691-ff2d1f55687e>2009-08-22 10:46:45 +0000
commit6cc7f94675654c91558f40e9c6b9abd230a9d6c1 (patch)
tree2d49a3565db45f8392f21060b456bcedaedb3c3a
parent30c11fc2c6ca5c3138a5cadf28211b9bdef5e530 (diff)
Patch by Dana Lacoste to fix a bug with post-review on Windows where we
improperly check for the os.uname function. Fixes bug #1280.
-rw-r--r--AUTHORS1
-rwxr-xr-xrbtools/postreview.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 390306e..ec4857a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ Lead Developers:
Contributors:
* Chris Clark
+ * Dana Lacoste
* Eric Huss
* Jeremy Bettis
* Lepton Wu
diff --git a/rbtools/postreview.py b/rbtools/postreview.py
index 9e1f1b1..c657acc 100755
--- a/rbtools/postreview.py
+++ b/rbtools/postreview.py
@@ -1629,7 +1629,7 @@ class PerforceClient(SCMClient):
Returns a list of strings of diff lines.
"""
- if os.uname and os.uname()[0] == 'SunOS':
+ if hasattr(os, 'uname') and os.uname()[0] == 'SunOS':
diff_cmd = ["gdiff", "-urNp", old_file, new_file]
else:
diff_cmd = ["diff", "-urNp", old_file, new_file]