Revert SVN #32360 until Windows compilation errors corrected.

[obnox/wireshark/wip.git] / tools / cvsdiff-fix.py

diff --git a/tools/cvsdiff-fix.py b/tools/cvsdiff-fix.py
index e2e0c7c99fe44e946039348bb629c94e22e7f137..6d9ecd3f812a5d0d2ae045527435ed7d7e2c8dcb 100755 (executable)
--- a/tools/cvsdiff-fix.py
+++ b/tools/cvsdiff-fix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # cvsdiff-fix
 #
@@ -6,7 +6,7 @@
 # recursive diff, and unflattens it so that it can be
 # applied correctly with "patch".
 #
-# $Id: cvsdiff-fix.py,v 1.2 2001/11/13 23:55:41 gram Exp $
+# $Id$
 #
 # Copyright (C) 2001 by Gilbert Ramirez <gram@alumni.rice.edu>
 #  
@@ -90,6 +90,10 @@ for line in input.readlines():
                        state = 2
        
        elif state == 2:
+               if line.find("Binary files") == 0:
+                       state = 0
+                       continue
+
                match = re_from.search(line)
                if match:
                        new_line = "--- %s\\g<after>" % (pathname)