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

svn path=/main/branches/2.1.2/; revision=7255

diff --git a/bin/emerge b/bin/emerge
index f6d51aa1c4e202f8de3966792745392f5ed579f0..9b36d02131b018058beedc12772b384177cf6e1f 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2757,7 +2757,6 @@ class depgraph:
                        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
@@ -2849,9 +2848,8 @@ class depgraph:
                                                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()