From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3K7b-0002Ut-8q for garchives@archives.gentoo.org; Sat, 26 Mar 2011 03:25:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9B3E1C001; Sat, 26 Mar 2011 03:24:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8F7691C001 for ; Sat, 26 Mar 2011 03:24:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28A3A1B410B for ; Sat, 26 Mar 2011 03:24:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7E3AB8006A for ; Sat, 26 Mar 2011 03:24:53 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <86250c61c7e3fd227e9e2ccbb48358b1c80114d1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Binpkg.py pym/_emerge/EbuildBuild.py pym/portage/dbapi/_MergeProcess.py X-VCS-Directories: pym/portage/dbapi/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 86250c61c7e3fd227e9e2ccbb48358b1c80114d1 Date: Sat, 26 Mar 2011 03:24:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 277f628b208cdc5c7de5b1de2e0f29a3 commit: 86250c61c7e3fd227e9e2ccbb48358b1c80114d1 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 26 03:24:10 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 03:24:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D86250c61 MergeProcess: call elog_process for replaced pkgs --- pym/_emerge/Binpkg.py | 2 -- pym/_emerge/EbuildBuild.py | 2 -- pym/portage/dbapi/_MergeProcess.py | 9 ++++++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index fbd2a53..62d44c4 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -304,8 +304,6 @@ class Binpkg(CompositeTask): def _unlock_builddir(self): if self.opts.pretend or self.opts.fetchonly: return - portage.elog.elog_process(self.pkg.cpv, self.settings, - phasefilter=3D("prerm", "postrm")) portage.elog.elog_process(self.pkg.cpv, self.settings) self._build_dir.unlock() =20 diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index b72b3d5..c7a5f5c 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -243,8 +243,6 @@ class EbuildBuild(CompositeTask): self.wait() =20 def _unlock_builddir(self): - portage.elog.elog_process(self.pkg.cpv, self.settings, - phasefilter=3D("prerm", "postrm")) portage.elog.elog_process(self.pkg.cpv, self.settings) self._build_dir.unlock() =20 diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index 809af37..10d8873 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -21,7 +21,7 @@ class MergeProcess(SpawnProcess): __slots__ =3D ('dblink', 'mycat', 'mypkg', 'settings', 'treetype', 'vartree', 'scheduler', 'blockers', 'pkgloc', 'infloc', 'myebuild', 'mydbapi', 'prev_mtimes', '_elog_reader_fd', '_elog_reg_id', - '_buf') + '_buf', '_elog_keys') =20 def _elog_output_handler(self, fd, event): output =3D None @@ -41,6 +41,7 @@ class MergeProcess(SpawnProcess): out =3D StringIO() for line in lines: funcname, phase, key, msg =3D line.split(' ', 3) + self._elog_keys.add(key) reporter =3D getattr(portage.elog.messages, funcname) reporter(msg, phase=3Dphase, key=3Dkey, out=3Dout) =20 @@ -67,6 +68,7 @@ class MergeProcess(SpawnProcess): os.close(elog_writer_fd) self._elog_reader_fd =3D elog_reader_fd self._buf =3D "" + self._elog_keys =3D set() self.vartree.dbapi._pkgs_changed =3D True portage.process.spawned_pids.append(pid) return [pid] @@ -124,5 +126,10 @@ class MergeProcess(SpawnProcess): if self._elog_reader_fd: os.close(self._elog_reader_fd) self._elog_reader_fd =3D None + if self._elog_keys is not None: + for key in self._elog_keys: + portage.elog.elog_process(key, self.settings, + phasefilter=3D("prerm", "postrm")) + self._elog_keys =3D None =20 super(MergeProcess, self)._unregister()