diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-05-23 20:52:25 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-05-23 20:52:25 +0000 |
commit | 2737e9a8b5ee396f4a8dbe35a52c80764ff384d8 (patch) | |
tree | c52389e7d0b5b41d8e8a88ba730fd4aa57087f24 /bin | |
parent | a6f70b667d6040017ce3bd1362b41187aa38d7d1 (diff) | |
download | portage-2737e9a8b5ee396f4a8dbe35a52c80764ff384d8.tar.gz portage-2737e9a8b5ee396f4a8dbe35a52c80764ff384d8.tar.bz2 portage-2737e9a8b5ee396f4a8dbe35a52c80764ff384d8.zip |
Add a 'ignore-previously-merged' config option which gives similar behavior to the --noconfmem emerge option. (trunk r6591:6592)
svn path=/main/branches/2.1.2/; revision=6608
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/dispatch-conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 348274802..779610996 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -141,6 +141,14 @@ class dispatch: else: newconf = conf['new'] + if newconf == mrgconf and \ + self.options.get('ignore-previously-merged') != 'yes' and \ + len(commands.getoutput(DIFF_CONTENTS % (conf['current'], mrgconf))) == 0: + # The current update is identical to the archived .dist + # version that has previously been merged. + os.unlink(mrgconf) + newconf = conf['new'] + mystatus, myoutput = commands.getstatusoutput( DIFF_CONTENTS % (conf ['current'], newconf)) same_file = 0 == len(myoutput) |