From d64853ea10f497f46df9a70689a12b7455cb18ee Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 24 May 2007 20:56:51 +0000 Subject: Fix the ignore-previously-merged option so that it compares the original files, since mrgconf can be identical to conf['current'] even when conf['new'] is different from the archived .dist version (due to diff3 merging). (trunk r6615) svn path=/main/branches/2.1.2/; revision=6616 --- bin/dispatch-conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/dispatch-conf') diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 779610996..6e7ab71f6 100755 --- 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) -- cgit v1.2.3-1-g7c22