diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-21 03:15:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-21 03:15:05 +0000 |
| commit | 5f207275a5867d19a98dcef4c5f7ca41c3413c5a (patch) | |
| tree | a295d3860c40e5a3d9c4e4da37a21fd7a681202c | |
| parent | 3f85e659b64ede24c16178bab63e587b841e2672 (diff) | |
| download | portage-5f207275a5867d19a98dcef4c5f7ca41c3413c5a.tar.gz portage-5f207275a5867d19a98dcef4c5f7ca41c3413c5a.tar.bz2 portage-5f207275a5867d19a98dcef4c5f7ca41c3413c5a.zip | |
Make sure that elog entries are also processed in *rm phases and that they are only processed once. This patch is from trunk r3539.
svn path=/main/branches/2.1/; revision=3576
| -rw-r--r-- | pym/portage.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index 0abfb8799..dad2583bc 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -508,6 +508,13 @@ def elog_process(cpv, mysettings): except portage_exception.PortageException, e: print e + # clean logfiles to avoid repetitions + for f in mylogfiles: + try: + os.unlink(os.path.join(mysettings["T"], "logging", f)) + except OSError: + pass + #parse /etc/env.d and generate /etc/profile.env def env_update(makelinks=1, target_root=None, prev_mtimes=None): @@ -6145,6 +6152,10 @@ class dblink: a = doebuild(myebuildpath, "postrm", self.myroot, self.settings, use_cache=0, tree="vartree", mydbapi=self.vartree.dbapi, vartree=self.vartree) + + # process logs created during pre/postrm + elog_process(self.mycpv, self.settings) + # XXX: Decide how to handle failures here. if a != 0: writemsg("!!! FAILED postrm: "+str(a)+"\n", noiselevel=-1) |