Fix the ignore-previously-merged option so that it compares the original files, since...

svn path=/main/branches/2.1.2/; revision=6616

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 779610996be3a826f4d66549e432b2328b1f4994..6e7ab71f650368fd5750a7eace80b5a52c4a6aa1 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -143,7 +143,8 @@ class dispatch:
 
             if newconf == mrgconf and \
                 self.options.get('ignore-previously-merged') != 'yes' and \
-                len(commands.getoutput(DIFF_CONTENTS % (conf['current'], mrgconf))) == 0:
+                os.path.exists(archive+'.dist') and \
+                len(commands.getoutput(DIFF_CONTENTS % (archive+'.dist', conf['new']))) == 0:
                 # The current update is identical to the archived .dist
                 # version that has previously been merged.
                 os.unlink(mrgconf)