diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:55:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:55:37 +0000 |
| commit | 8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec (patch) | |
| tree | 2f9123b2386d99200059c26d0c7b6d4481aed389 /bin/dispatch-conf | |
| parent | Make PackageIndex.write() omit USE when appropriate. (diff) | |
| download | portage-multirepo-8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec.tar.gz portage-multirepo-8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec.tar.bz2 portage-multirepo-8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec.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).
svn path=/main/trunk/; revision=6615
Diffstat (limited to 'bin/dispatch-conf')
| -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 816de0de..e71512c7 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) |