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 1Pm4Qr-0007AK-2S for garchives@archives.gentoo.org; Sun, 06 Feb 2011 13:13:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BE8EE0BBB; Sun, 6 Feb 2011 13:10:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 48293E0BCA for ; Sun, 6 Feb 2011 13:10:10 +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 B00EC1B42EF for ; Sun, 6 Feb 2011 13:10:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7A66180079 for ; Sun, 6 Feb 2011 13:10:03 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: Subject: [gentoo-commits] proj/portage:multilib commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: ebc2fafe4a7261ba6e97c3f0ec134b7ca542d1d7 Date: Sun, 6 Feb 2011 13:10:03 +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: 34fbcc65dafe29cfb86c01593175937e commit: ebc2fafe4a7261ba6e97c3f0ec134b7ca542d1d7 Author: Zac Medico gentoo org> AuthorDate: Wed Feb 2 23:51:00 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Wed Feb 2 23:51:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Debc2fafe REQUIRED_USE: handle unsatisfied like normal dep --- pym/_emerge/depgraph.py | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 45873af..2f8037a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -197,7 +197,6 @@ class _dynamic_depgraph_config(object): self._initially_unsatisfied_deps =3D [] self._ignored_deps =3D [] self._highest_pkg_cache =3D {} - self._pkg_config_issues =3D {} =20 self._needed_unstable_keywords =3D backtrack_parameters.needed_unstabl= e_keywords self._needed_license_changes =3D backtrack_parameters.needed_license_c= hanges @@ -355,8 +354,7 @@ class depgraph(object): # missed update from each SLOT. missed_updates =3D {} for pkg, mask_reasons in \ - chain(self._dynamic_config._runtime_pkg_mask.items(), - self._dynamic_config._pkg_config_issues.items()): + self._dynamic_config._runtime_pkg_mask.items(): if pkg.installed: # Exclude installed here since we only # want to show available updates. @@ -385,13 +383,6 @@ class depgraph(object): missed_update_types.pop("slot conflict", None) missed_update_types.pop("missing dependency", None) =20 - required_use =3D missed_update_types.pop("required use", None) - if required_use is not None: - # For display purposes, unsatisfied REQUIRED_USE - # can be treated like a missing dependency. - missed_update_types.setdefault("missing dependency", - []).extend(required_use) - self._show_missed_update_slot_conflicts( missed_update_types.get("slot conflict")) =20 @@ -844,13 +835,11 @@ class depgraph(object): parent, atom =3D parent_atom self._add_parent_atom(pkg, parent_atom) =20 - config_issues =3D \ - self._dynamic_config._pkg_config_issues.setdefault(pkg, {}) - parent_atoms =3D config_issues.setdefault("required use", set()) - all_parent_atoms =3D self._dynamic_config._parent_atoms.get(pkg) - if all_parent_atoms is not None: - for parent, atom in all_parent_atoms: - parent_atoms.add((parent, pkg.root, atom)) + atom =3D dep.atom + if atom is None: + atom =3D Atom("=3D" + pkg.cpv) + self._dynamic_config._unsatisfied_deps_for_display.append( + ((pkg.root, atom), {"myparent":dep.parent})) return 0 =20 if not pkg.onlydeps: