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 1QIyRh-00038D-96 for garchives@archives.gentoo.org; Sun, 08 May 2011 07:30:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B46B1C001; Sun, 8 May 2011 07:30:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C06E1C001 for ; Sun, 8 May 2011 07:30:21 +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 BFC751B402B for ; Sun, 8 May 2011 07:30:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 124F145B2A for ; Sun, 8 May 2011 07:30:20 +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: <05b16b9d1c4eacc3442b78152f46f5d07943de97.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 05b16b9d1c4eacc3442b78152f46f5d07943de97 Date: Sun, 8 May 2011 07:30:20 +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: 091e0b9534707ce25ba5ef278a7c9342 commit: 05b16b9d1c4eacc3442b78152f46f5d07943de97 Author: David James chromium org> AuthorDate: Sun May 8 07:26:42 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 8 07:30:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D05b16b9d Fix typos in unmerge function. BUG=3Dnone TEST=3DTry unmerging some packages. Change-Id: Ib643ec95b8da14b49a6b519e445fe57f8995c52c --- pym/portage/dbapi/vartree.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 92c467d..a4a4203 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4071,18 +4071,18 @@ def unmerge(cat, pkg, myroot=3DNone, settings=3DN= one, mylink =3D dblink(cat, pkg, settings=3Dsettings, treetype=3D"vartree", vartree=3Dvartree, scheduler=3Dscheduler) vartree =3D mylink.vartree - parallel_install =3D "parallel-install" in self.settings.features + parallel_install =3D "parallel-install" in settings.features if not parallel_install: - self.lockdb() + mylink.lockdb() try: if mylink.exists(): retval =3D mylink.unmerge(ldpath_mtimes=3Dldpath_mtimes) if retval =3D=3D os.EX_OK: - self.lockdb() + mylink.lockdb() try: mylink.delete() finally: - self.unlockdb() + mylink.unlockdb() return retval return os.EX_OK finally: @@ -4092,7 +4092,7 @@ def unmerge(cat, pkg, myroot=3DNone, settings=3DNon= e, else: vartree.dbapi._linkmap._clear_cache() if not parallel_install: - self.unlockdb() + mylink.unlockdb() =20 def write_contents(contents, root, f): """