[gentoo-commits] proj/portage:multilib commit in: pym/_emerge/

[Thomas Sachau]

commit:     f7cdc96239e36ff6012b8e06f5666ed3f675d3eb
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 12:54:14 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 12:54:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f7cdc962

main.py: Move multilib behind force-multilib FEATURE, extend error message

---
 pym/_emerge/main.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 6f2f1d7..a1c44ea 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1653,10 +1653,13 @@ def emerge_main(args=None):
 	adjust_configs(myopts, trees)
 	apply_priorities(settings)
 
-	if settings.get("NO_AUTO_FLAG", "") is "":
-		writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
-		writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
-		return 1
+	if 'force-multilib' in settings.get("FEATURES", ""):
+		if settings.get("NO_AUTO_FLAG", "") is "":
+			writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
+			writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
+			writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1)
+			writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1)
+			return 1
 
 	if myaction == 'version':
 		writemsg_stdout(getportageversion(