From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 24 May 2007 20:55:37 +0000 (-0000)
Subject: Fix the ignore-previously-merged option so that it compares the original files, since... 
X-Git-Tag: v2.2_pre1~1374
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec;p=portage.git

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).

svn path=/main/trunk/; revision=6615
---

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 816de0de3..e71512c7e 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)