| 1 |
commit: a7071bd82676ffdf3020b2f71effa2512ed803d4 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 18:46:00 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 18:46:00 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a7071bd8 |
| 7 |
|
| 8 |
Fix FEATURES=no{doc,info,man} for bug #403181 |
| 9 |
|
| 10 |
This has been broken since commit |
| 11 |
93b654199a32fc3df1299b030317720b9294b0c3. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/dbapi/vartree.py | 5 ++++- |
| 15 |
1 files changed, 4 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 18 |
index c504e5c..a86170c 100644 |
| 19 |
--- a/pym/portage/dbapi/vartree.py |
| 20 |
+++ b/pym/portage/dbapi/vartree.py |
| 21 |
@@ -3381,7 +3381,10 @@ class dblink(object): |
| 22 |
max_dblnk = dblnk |
| 23 |
self._installed_instance = max_dblnk |
| 24 |
|
| 25 |
- if self.settings.get("INSTALL_MASK"): |
| 26 |
+ if self.settings.get("INSTALL_MASK") or \ |
| 27 |
+ "nodoc" in self.settings.features or \ |
| 28 |
+ "noinfo" in self.settings.features or \ |
| 29 |
+ "noman" in self.settings.features: |
| 30 |
# Apply INSTALL_MASK before collision-protect, since it may |
| 31 |
# be useful to avoid collisions in some scenarios. |
| 32 |
phase = MiscFunctionsProcess(background=False, |
Archives