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 1PlPrJ-0004IL-1b for garchives@archives.gentoo.org; Fri, 04 Feb 2011 17:54:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13E87E0A6D; Fri, 4 Feb 2011 17:54:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D9E65E0A7D for ; Fri, 4 Feb 2011 17:54:04 +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 5C7BB1B4022 for ; Fri, 4 Feb 2011 17:54:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1C33F80074 for ; Fri, 4 Feb 2011 17:47:11 +0000 (UTC) To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <320df213972f7ce50e7f2379a3a0d7d0bbbef051.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 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: 320df213972f7ce50e7f2379a3a0d7d0bbbef051 Date: Fri, 4 Feb 2011 17:47:11 +0000 (UTC) From: zmedico@gentoo.org 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: 5826470534b41f3487777829bb13b091 commit: 320df213972f7ce50e7f2379a3a0d7d0bbbef051 Author: Zac Medico gentoo org> AuthorDate: Fri Feb 4 17:41:30 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 4 17:46:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D320df213972f7ce50e7f2379a3a0d7d0bbbef051 depgraph: make downgrades trigger complete graph It's common for downgrades to break dependencies, as in bug #353613, so automatically trigger complete graph mode when a downgrade is found. --- pym/_emerge/depgraph.py | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5380de1..7b74a26 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3408,8 +3408,27 @@ class depgraph(object): return 1 =20 if "complete" not in self._dynamic_config.myparams: - # Skip this to avoid consuming enough time to disturb users. - return 1 + # Automatically enable complete mode if there are any + # downgrades, since they often break dependencies + # (like in bug #353613). + have_downgrade =3D False + for node in self._dynamic_config.digraph: + if not isinstance(node, Package) or \ + node.operation !=3D "merge": + continue + 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: + have_downgrade =3D True + break + + if have_downgrade: + self._dynamic_config.myparams["complete"] =3D True + else: + # Skip complete graph mode, in order to avoid consuming + # enough time to disturb users. + return 1 =20 self._load_vdb() =20