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 1ShTtr-00054f-34 for garchives@archives.gentoo.org; Wed, 20 Jun 2012 23:01:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA0C9E085D; Wed, 20 Jun 2012 23:01:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 76975E085D for ; Wed, 20 Jun 2012 23:01:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB5ED1B400B for ; Wed, 20 Jun 2012 23:01:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8D016E5435 for ; Wed, 20 Jun 2012 23:01:12 +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: <1340233261.5d2147c6dab5869ebdd0c27fa2e0b71513057da0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5d2147c6dab5869ebdd0c27fa2e0b71513057da0 X-VCS-Branch: master Date: Wed, 20 Jun 2012 23:01:12 +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: 8acb52fc-4f3a-45f6-8ac0-43eb8944be44 X-Archives-Hash: fa07336d97eb3b53ac2d0815642e4130 commit: 5d2147c6dab5869ebdd0c27fa2e0b71513057da0 Author: Zac Medico gentoo org> AuthorDate: Wed Jun 20 23:01:01 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 20 23:01:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5d2147c6 depgraph._complete_graph: old virt sanity check --- pym/_emerge/depgraph.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ad28d69..0c014bc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4309,9 +4309,11 @@ class depgraph(object): vardb =3D self._frozen_config.roots[ node.root].trees["vartree"].dbapi inst_pkg =3D vardb.match_pkgs(node.slot_atom) - if inst_pkg and (inst_pkg[0] > node or inst_pkg[0] < node): - version_change =3D True - break + if inst_pkg and inst_pkg[0].cp =3D=3D node.cp: + inst_pkg =3D inst_pkg[0] + if inst_pkg < node or node < inst_pkg: + version_change =3D True + break =20 if version_change: self._dynamic_config.myparams["complete"] =3D True