From b06cc0519d1f8f6b23e93cd7990aeea215d78522 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 14 Jul 2007 20:28:08 +0000 Subject: For bug #185278, make the verbose flag display show masked/forced flag status for binary packages too. svn path=/main/trunk/; revision=7254 --- pym/emerge/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pym/emerge') diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 719677a36..907a1b734 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2814,7 +2814,6 @@ class depgraph(object): else: pkg_status = x[3] pkg_merge = ordered and pkg_status != "nomerge" - binary_package = pkg_type != "ebuild" if pkg_node in self._slot_collision_nodes or \ (pkg_status == "nomerge" and pkg_type != "installed"): # The metadata isn't cached due to a slot collision or @@ -2920,9 +2919,8 @@ class depgraph(object): mydbapi.aux_get(pkg_key, ["IUSE"])[0].split())) forced_flags = set() - if not binary_package: - forced_flags.update(pkgsettings.useforce) - forced_flags.update(pkgsettings.usemask) + forced_flags.update(pkgsettings.useforce) + forced_flags.update(pkgsettings.usemask) cur_iuse = portage.unique_array(cur_iuse) cur_iuse.sort() -- cgit v1.2.3-1-g7c22