For bug #185278, make the verbose flag display show masked/forced flag status for...

svn path=/main/trunk/; revision=7254

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 719677a36e0e1e3191c8016958c4b59438a0872f..907a1b734800d8eafa54664a2bd80bc516d73150 100644 (file)
--- 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()