Make _global_updates() silently return if ROOT != "/" and make fixpackages

bail out with an error message in this case which suggests to instead use
emaint --fix movebin and/or moveinst. This prevents useless/ugly global
updates messages that flood the terminal when ROOT != "/". (trunk r15728)

svn path=/main/branches/2.1.7/; revision=15729

2 files changed, 18 insertions, 3 deletions

diff --git a/bin/fixpackages b/bin/fixpackages
index 22f90dd2..37cdf282 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -15,11 +15,22 @@ except ImportError:
 	import portage
 
 from portage import os
+from portage.output import EOutput
+from textwrap import wrap
 from portage._global_updates import _global_updates
 mysettings = portage.settings
 mytrees = portage.db
 mtimedb = portage.mtimedb
 
+if mysettings['ROOT'] != "/":
+	out = EOutput()
+	msg = "The fixpackages program is not intended for use with " + \
+		"ROOT != \"/\". Instead use `emaint --fix movebin` and/or " + \
+		"`emaint --fix moveinst."
+	for line in wrap(msg, 72):
+		out.eerror(line)
+	sys.exit(1)
+
 try:
 	os.nice(int(mysettings.get("PORTAGE_NICENESS", "0")))
 except (OSError, ValueError) as e:
diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index 040de276..cdb73187 100644
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -18,6 +18,8 @@ from portage.util import grabfile, writemsg, writemsg_stdout, write_atomic
 def _global_updates(trees, prev_mtimes):
 	"""
 	Perform new global updates if they exist in $PORTDIR/profiles/updates/.
+	This simply returns if ROOT != "/" (when len(trees) != 1). If ROOT != "/"
+	then the user should instead use emaint --fix movebin and/or moveinst.
 
 	@param trees: A dictionary containing portage trees.
 	@type trees: dict
@@ -30,8 +32,10 @@ def _global_updates(trees, prev_mtimes):
 	"""
 	# only do this if we're root and not running repoman/ebuild digest
 
-	if secpass < 2 or "SANDBOX_ACTIVE" in os.environ:
-		return
+	if secpass < 2 or \
+		"SANDBOX_ACTIVE" in os.environ or \
+		len(trees) != 1:
+		return 0
 	root = "/"
 	mysettings = trees["/"]["vartree"].settings
 	updpath = os.path.join(mysettings["PORTDIR"], "profiles", "updates")
@@ -44,7 +48,7 @@ def _global_updates(trees, prev_mtimes):
 	except DirectoryNotFound:
 		writemsg(_("--- 'profiles/updates' is empty or "
 			"not available. Empty portage tree?\n"), noiselevel=1)
-		return
+		return 0
 	myupd = None
 	if len(update_data) > 0:
 		do_upgrade_packagesmessage = 0