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 1Q3XHG-0007Lb-9c for garchives@archives.gentoo.org; Sat, 26 Mar 2011 17:27:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D0F51C04E; Sat, 26 Mar 2011 17:25:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 093151C04E for ; Sat, 26 Mar 2011 17:25:46 +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 7D8B91B4122 for ; Sat, 26 Mar 2011 17:25:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E2EF88006A for ; Sat, 26 Mar 2011 17:25:45 +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/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e2981b3398620968dcf3bb5d3c3d6c0f7714d136 Date: Sat, 26 Mar 2011 17:25:45 +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: d31bc58f579514780892c2168711da31 commit: e2981b3398620968dcf3bb5d3c3d6c0f7714d136 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 26 17:10:24 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 17:10:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De2981b33 Scheduler: pkg_to_replace beware old-style virt --- pym/_emerge/Scheduler.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 7d34d70..06eeed5 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1799,7 +1799,8 @@ class Scheduler(PollScheduler): pkg_to_replace =3D None if pkg.operation !=3D "uninstall": vardb =3D pkg.root_config.trees["vartree"].dbapi - previous_cpv =3D vardb.match(pkg.slot_atom) + previous_cpv =3D [x for x in vardb.match(pkg.slot_atom) \ + if portage.cpv_getkey(x) =3D=3D pkg.cp] if not previous_cpv and vardb.cpv_exists(pkg.cpv): # same cpv, different SLOT previous_cpv =3D [pkg.cpv]