From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 80E9D198005 for ; Tue, 19 Mar 2013 18:47:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAB24E0566; Tue, 19 Mar 2013 18:47:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A1E4E0566 for ; Tue, 19 Mar 2013 18:47:48 +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 3E00B33D3D6 for ; Tue, 19 Mar 2013 18:47:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D381AE4073 for ; Tue, 19 Mar 2013 18:47:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1363718851.ebecb93645d1d742e47792c40f4f79dff40362e5.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: ebecb93645d1d742e47792c40f4f79dff40362e5 X-VCS-Branch: master Date: Tue, 19 Mar 2013 18:47: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 X-Archives-Salt: d506ab10-01c7-48c9-8b92-3262638f3d52 X-Archives-Hash: b72dc301ae90296b26d9a63da66c7e22 commit: ebecb93645d1d742e47792c40f4f79dff40362e5 Author: Zac Medico gentoo org> AuthorDate: Tue Mar 19 18:47:31 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 19 18:47:31 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ebecb936 autounmask: remove faulty reset_pkg() function This function did not work as intended, due to the pkg variable being updated in the wrong scope. --- pym/_emerge/depgraph.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 326dd68..a17398c 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4342,15 +4342,12 @@ class depgraph(object): default_selection = (pkg, existing) - def reset_pkg(pkg): + if self._dynamic_config._autounmask is True: if pkg is not None and \ pkg.installed and \ not self._want_installed_pkg(pkg): pkg = None - if self._dynamic_config._autounmask is True: - reset_pkg(pkg) - # Temporarily reset _need_restart state, in order to # avoid interference as reported in bug #459832. earlier_need_restart = self._dynamic_config._need_restart @@ -4365,7 +4362,10 @@ class depgraph(object): root, atom, onlydeps=onlydeps, autounmask_level=autounmask_level) - reset_pkg(pkg) + if pkg is not None and \ + pkg.installed and \ + not self._want_installed_pkg(pkg): + pkg = None if self._dynamic_config._need_restart: return None, None