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 1PxA64-0005OH-09 for garchives@archives.gentoo.org; Wed, 09 Mar 2011 03:30:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29ED0E04C1; Wed, 9 Mar 2011 03:29:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EA23DE057F for ; Wed, 9 Mar 2011 03:29:22 +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 7E2091B4167 for ; Wed, 9 Mar 2011 03:29:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9B36C8006A for ; Wed, 9 Mar 2011 03:29:21 +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: <6b604d43c68cab45ea5668042a53c23d4012bb18.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/unmerge.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6b604d43c68cab45ea5668042a53c23d4012bb18 Date: Wed, 9 Mar 2011 03:29:21 +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: 213b0d0472d8c3d954e6985e492e5a23 commit: 6b604d43c68cab45ea5668042a53c23d4012bb18 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 9 03:28:21 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 9 03:28:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6b604d43 unmerge: use vardbapi._dblink() to simplify The dblink constructor is complex and best avoided. --- pym/_emerge/unmerge.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index a6a330c..68b61ed 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -7,7 +7,6 @@ import logging import sys import textwrap import portage -import portage.dbapi.vartree from portage import os from portage.output import bold, colorize, darkgreen, green from portage._sets import SETPREFIX @@ -321,9 +320,7 @@ def unmerge(root_config, myopts, unmerge_action, msg =3D ("Not unmerging package %s since there is no valid reason " "for Portage to unmerge itself.") % (pkg.cpv,) skip_pkg =3D True - elif portage.dbapi.vartree.dblink(pkg.category, pkg.pf, - settings=3Dsettings, treetype=3D"vartree", vartree=3Dvartree, - scheduler=3Dscheduler).isowner(portage._python_interpreter): + elif vartree.dbapi._dblink(cpv).isowner(portage._python_interpreter)= : msg =3D ("Not unmerging package %s since there is no valid reason " "for Portage to unmerge currently used Python interpreter.") % (pk= g.cpv,) skip_pkg =3D True