[patch] use the diff exit code to detect two binary files that differ

diff_exit_code.patch (text/plain), 1.22 KB, created by Zac Medico on 2006-11-01 01:42:51 UTC

Index: bin/dispatch-conf
===================================================================
--- bin/dispatch-conf	(revision 4900)
+++ bin/dispatch-conf	(revision 4901)
@@ -140,9 +140,18 @@
             else:
                 newconf = conf['new']
 
-            same_file = len(commands.getoutput (DIFF_CONTENTS   % (conf ['current'], newconf))) == 0
-            same_cvs  = len(commands.getoutput (DIFF_CVS_INTERP % (conf ['current'], newconf))) == 0
-            same_wsc  = len(commands.getoutput (DIFF_WSCOMMENTS % (conf ['current'], newconf))) == 0
+            mystatus, myoutput = commands.getstatusoutput(
+                DIFF_CONTENTS  % (conf ['current'], newconf))
+            same_file = 0 == len(myoutput)
+            if mystatus >> 8 == 2:
+                # Binary files differ
+                same_cvs = False
+                same_wsc = False
+            else:
+                same_cvs = 0 == len(commands.getoutput(
+                    DIFF_CVS_INTERP % (conf ['current'], newconf)))
+                same_wsc = 0 == len(commands.getoutput(
+                    DIFF_WSCOMMENTS % (conf ['current'], newconf)))
 
             # Do options permit?
             same_cvs = same_cvs and self.options['replace-cvs'] == 'yes'