diff options
| -rwxr-xr-x | bin/dispatch-conf | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index c9f3655f0..6a007ab53 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -140,9 +140,18 @@ class dispatch: 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' |