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 1QOkac-0008VX-9U for garchives@archives.gentoo.org; Tue, 24 May 2011 05:55:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2EC11C2A4; Tue, 24 May 2011 05:55:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B025F1C2A4 for ; Tue, 24 May 2011 05:55:26 +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 4838D1B4002 for ; Tue, 24 May 2011 05:55:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 73DFA80505 for ; Tue, 24 May 2011 05:55:25 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PackageUninstall.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e5e2368544098b999ae60412c70f96dab3ad9d4c Date: Tue, 24 May 2011 05:55:25 +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: 7965be3d4c0d78738a0752c623503b05 commit: e5e2368544098b999ae60412c70f96dab3ad9d4c Author: Zac Medico gentoo org> AuthorDate: Tue May 24 05:54:57 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue May 24 05:54:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De5e23685 PackageUninstall: log more output --- pym/_emerge/PackageUninstall.py | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninsta= ll.py index 0829f50..41409ba 100644 --- a/pym/_emerge/PackageUninstall.py +++ b/pym/_emerge/PackageUninstall.py @@ -43,11 +43,21 @@ class PackageUninstall(CompositeTask): # and pkg_postrm phases from executing. pass =20 + self._builddir_lock =3D EbuildBuildDir( + scheduler=3Dself.scheduler, settings=3Dself.settings) + self._builddir_lock.lock() + + portage.prepare_build_dirs( + settings=3Dself.settings, cleanup=3DTrue) + + # Output only gets logged if it comes after prepare_build_dirs() + # which initializes PORTAGE_LOG_FILE. retval, pkgmap =3D _unmerge_display(self.pkg.root_config, self.opts, "unmerge", [self.pkg.cpv], clean_delay=3D0, writemsg_level=3Dself._writemsg_level) =20 if retval !=3D os.EX_OK: + self._builddir_lock.unlock() self.returncode =3D retval self.wait() return @@ -57,14 +67,6 @@ class PackageUninstall(CompositeTask): self._emergelog("=3D=3D=3D Unmerging... (%s)" % (self.pkg.cpv,)) =20 cat, pf =3D portage.catsplit(self.pkg.cpv) - - self._builddir_lock =3D EbuildBuildDir( - scheduler=3Dself.scheduler, settings=3Dself.settings) - self._builddir_lock.lock() - - portage.prepare_build_dirs( - settings=3Dself.settings, cleanup=3DTrue) - unmerge_task =3D MergeProcess( mycat=3Dcat, mypkg=3Dpf, settings=3Dself.settings, treetype=3D"vartree", vartree=3Dself.pkg.root_config.trees["vartree"]= , @@ -97,4 +99,5 @@ class PackageUninstall(CompositeTask): portage.util.writemsg_level(msg, level=3Dlevel, noiselevel=3Dnoiselevel) else: - self.scheduler.output(msg, level=3Dlevel, noiselevel=3Dnoiselevel) + self.scheduler.output(msg, log_path=3Dlog_path, + level=3Dlevel, noiselevel=3Dnoiselevel)