summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge
index f6d51aa1c..9b36d0213 100755
--- 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()