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 1QP1zU-0000Q9-T8 for garchives@archives.gentoo.org; Wed, 25 May 2011 00:30:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 626561C006; Wed, 25 May 2011 00:30:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2ACD61C006 for ; Wed, 25 May 2011 00:30:16 +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 B6EAA1B4027 for ; Wed, 25 May 2011 00:30:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D1C0C80505 for ; Wed, 25 May 2011 00:30:14 +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: <53daf8dec6740d6c04e4dd76dd36d1cc19093c27.zmedico@gentoo> 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: 53daf8dec6740d6c04e4dd76dd36d1cc19093c27 Date: Wed, 25 May 2011 00:30:14 +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: a033cd115e7c9240a6ee95e9eb2ccdc7 commit: 53daf8dec6740d6c04e4dd76dd36d1cc19093c27 Author: Zac Medico gentoo org> AuthorDate: Wed May 25 00:29:27 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 25 00:29:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D53daf8de PackageUninstall: remove extra cat/pf var init Also, add to comments about ebuild-locks. --- pym/_emerge/PackageUninstall.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninsta= ll.py index 41409ba..aebf55e 100644 --- a/pym/_emerge/PackageUninstall.py +++ b/pym/_emerge/PackageUninstall.py @@ -18,7 +18,8 @@ class PackageUninstall(CompositeTask): it is essential for the ebuild-locks code to execute in a subprocess, since the portage.locks module does not behave as desired if we try to lock the same file multiple times - concurrently from the same process. + concurrently from the same process for ebuild-locks phases + such as pkg_setup, pkg_prerm, and pkg_postrm. """ =20 __slots__ =3D ("world_atom", "ldpath_mtimes", "opts", @@ -66,7 +67,6 @@ class PackageUninstall(CompositeTask): noiselevel=3D-1) self._emergelog("=3D=3D=3D Unmerging... (%s)" % (self.pkg.cpv,)) =20 - cat, pf =3D portage.catsplit(self.pkg.cpv) unmerge_task =3D MergeProcess( mycat=3Dcat, mypkg=3Dpf, settings=3Dself.settings, treetype=3D"vartree", vartree=3Dself.pkg.root_config.trees["vartree"]= ,