Fix portage.global_updates() and portage.do_vartree() so they don't have to use any globals.

svn path=/main/trunk/; revision=3253

1 files changed, 3 insertions, 1 deletions

diff --git a/bin/emerge b/bin/emerge
index fc3677ee5..1034066bd 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -10,7 +10,6 @@ import errno
 
 try:
 	import portage
-	portage.global_updates()
 except KeyboardInterrupt:
 	sys.exit(1) # If they control C during imports, just die silently
 
@@ -23,6 +22,9 @@ import portage_locks
 import portage_exception
 from portage_const import PROFILE_PATH
 
+portage.global_updates(
+	portage.settings, portage.db, portage.mtimedb["updates"])
+
 spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")",
                 "Thank you for using Gentoo. :)",
                 "Are you actually trying to read this?",