From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Sep 2012 06:00:16 +0000 (-0700)
Subject: dep_check: cleanup repoman use.force/mask code
X-Git-Tag: v2.2.0_alpha129~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c138e8e2654ad9350eec2a433991b882b4c6b058;p=portage.git

dep_check: cleanup repoman use.force/mask code
---

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index ecb8a9b4e..6d1969e17 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -564,18 +564,15 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
 
 	mymasks = set()
 	useforce = set()
-	useforce.add(mysettings["ARCH"])
 	if use == "all":
-		# This masking/forcing is only for repoman.  In other cases, relevant
-		# masking/forcing should have already been applied via
-		# config.regenerate().  Also, binary or installed packages may have
-		# been built with flags that are now masked, and it would be
-		# inconsistent to mask them now.  Additionally, myuse may consist of
-		# flags from a parent package that is being merged to a $ROOT that is
-		# different from the one that mysettings represents.
+		# This is only for repoman, in order to constrain the use_reduce
+		# matchall behavior to account for profile use.mask/force. The
+		# ARCH/archlist code here may be redundant, since the profile
+		# really should be handling ARCH masking/forcing itself.
 		mymasks.update(mysettings.usemask)
 		mymasks.update(mysettings.archlist())
 		mymasks.discard(mysettings["ARCH"])
+		useforce.add(mysettings["ARCH"])
 		useforce.update(mysettings.useforce)
 		useforce.difference_update(mymasks)