aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-02-11 18:46:00 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-02-11 18:46:00 (GMT)
commita7071bd82676ffdf3020b2f71effa2512ed803d4 (patch)
tree6e7e412b82d990f7c0998d9cc51c0c2812acdf43
parentrepoman: no ChangeLog for Manifest-only commit (diff)
downloadportage-a7071bd82676ffdf3020b2f71effa2512ed803d4.zip
portage-a7071bd82676ffdf3020b2f71effa2512ed803d4.tar.gz
portage-a7071bd82676ffdf3020b2f71effa2512ed803d4.tar.bz2
Fix FEATURES=no{doc,info,man} for bug #403181
This has been broken since commit 93b654199a32fc3df1299b030317720b9294b0c3.
-rw-r--r--pym/portage/dbapi/vartree.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index c504e5c..a86170c 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,