diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-05-23 10:43:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-23 10:43:38 +0000 |
| commit | 485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc (patch) | |
| tree | 6cd0fc6cefebf6effa3c4b315e899885da9cca81 /bin/dispatch-conf | |
| parent | Pass a temporary file name to the package phase in the environment variable P... (diff) | |
| download | portage-multirepo-485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc.tar.gz portage-multirepo-485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc.tar.bz2 portage-multirepo-485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc.zip | |
Add a 'ignore-previously-merged' config option which gives similar behavior to the --noconfmem emerge option.
svn path=/main/trunk/; revision=6592
Diffstat (limited to 'bin/dispatch-conf')
| -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 a62a0ef4..816de0de 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) |