From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 11 Feb 2012 18:46:00 +0000 (-0800)
Subject: Fix FEATURES=no{doc,info,man} for bug #403181
X-Git-Tag: v2.2.0_alpha86~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7071bd82676ffdf3020b2f71effa2512ed803d4;p=portage.git

Fix FEATURES=no{doc,info,man} for bug #403181

This has been broken since commit
93b654199a32fc3df1299b030317720b9294b0c3.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index c504e5ca4..a86170c1a 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3381,7 +3381,10 @@ class dblink(object):
 					max_dblnk = dblnk
 			self._installed_instance = max_dblnk
 
-		if self.settings.get("INSTALL_MASK"):
+		if self.settings.get("INSTALL_MASK") or \
+			"nodoc" in self.settings.features or \
+			"noinfo" in self.settings.features or \
+			"noman" in self.settings.features:
 			# Apply INSTALL_MASK before collision-protect, since it may
 			# be useful to avoid collisions in some scenarios.
 			phase = MiscFunctionsProcess(background=False,