diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:56:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:56:51 +0000 |
| commit | d64853ea10f497f46df9a70689a12b7455cb18ee (patch) | |
| tree | eab959364803cce0de3ebbc45a6877ff6eca6096 | |
| parent | 2737e9a8b5ee396f4a8dbe35a52c80764ff384d8 (diff) | |
| download | portage-d64853ea10f497f46df9a70689a12b7455cb18ee.tar.gz portage-d64853ea10f497f46df9a70689a12b7455cb18ee.tar.bz2 portage-d64853ea10f497f46df9a70689a12b7455cb18ee.zip | |
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
| -rwxr-xr-x | bin/dispatch-conf | 3 |
1 files changed, 2 insertions, 1 deletions
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) |