fake merge core fixes from haiku

hecanjog · Feb 20, 2012 · 007366c · 007366c
1 parent 8ce8428
commit 007366c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/fabric/fabric.py b/fabric/fabric.py
@@ -453,10 +453,14 @@ def iscrossing(first, second):
         first = struct.unpack("<h", first) 
         second = struct.unpack("<h", second) 
 
-        if first[0] >= 0 and second[0] <= 0:
+        if first[0] > 0 and second[0] < 0:
             return True
-        elif first[0] <= 0 and second[0] >= 0:
+        elif first[0] < 0 and second[0] > 0:
             return True
+        elif first[0] == 0 and second[0] != 0:
+            return False 
+        elif first[0] != 0 and second[0] == 0:
+            return True 
 
     return False