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 1QJ8i6-0004bx-Vk for garchives@archives.gentoo.org; Sun, 08 May 2011 18:28:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0A6F1C003; Sun, 8 May 2011 18:27:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 88D3E1C003 for ; Sun, 8 May 2011 18:27:58 +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 AAF081B405D for ; Sun, 8 May 2011 18:27:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F292874489 for ; Sun, 8 May 2011 18:27:56 +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: <98b0a31bf0c3cc9dce6788eae4beee04ce354791.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: 98b0a31bf0c3cc9dce6788eae4beee04ce354791 Date: Sun, 8 May 2011 18:27:56 +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: 27b69e7accf076dd2a225f8cad6deb15 commit: 98b0a31bf0c3cc9dce6788eae4beee04ce354791 Author: Zac Medico gentoo org> AuthorDate: Sun May 8 18:24:40 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 8 18:24:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D98b0a31b resume_depgraph: don't call break_refs in loop The break_refs call was unnecessary and it broke the state of the frozen_config instance, causing the following error: File "pym/_emerge/depgraph.py", line 1290, in _wrapped_add_pkg_dep_string inst_pkgs =3D vardb.match_pkgs(atom) AttributeError: 'vardbapi' object has no attribute 'match_pkgs' --- pym/_emerge/depgraph.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 1f80d0c..83d6e9b 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4606,7 +4606,7 @@ class depgraph(object): Break any references in Package instances that lead back to the depgra= ph. This is useful if you want to hold references to packages without also holding the depgraph on the heap. It should only be called after the - depgraph will not be used for any more calculations. + depgraph and _frozen_config will not be used for any more calculations= . """ for root_config in self._frozen_config.roots.values(): root_config.update(self._frozen_config._trees_orig[ @@ -6421,7 +6421,6 @@ def _resume_depgraph(settings, trees, mtimedb, myop= ts, myparams, spinner): # package has already been installed. dropped_tasks.update(pkg for pkg in \ unsatisfied_parents if pkg.operation !=3D "nomerge") - mydepgraph.break_refs() =20 del e, graph, traversed_nodes, \ unsatisfied_parents, unsatisfied_stack