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 <gentoo-commits+bounces-325518-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PzAb3-0000DD-Da
for garchives@archives.gentoo.org; Mon, 14 Mar 2011 16:26:17 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D5A25E0592;
Mon, 14 Mar 2011 16:24:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id A41EE1C04A
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Mar 2011 16:24:45 +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 3590A1BC0E8
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Mar 2011 16:24:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 99BAF80073
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Mar 2011 16:24:44 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <c1fba51ccab868d05f48fcc40bc2c959c9385e76.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:2.1.9 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: c1fba51ccab868d05f48fcc40bc2c959c9385e76
Date: Mon, 14 Mar 2011 16:24:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: e78dfabf804d0af4043dcf3d2f6c44be
commit: c1fba51ccab868d05f48fcc40bc2c959c9385e76
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 03:28:21 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 16:22:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dc1fba51c
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