2 files changed, 9 insertions, 2 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?",
diff --git a/bin/fixpackages b/bin/fixpackages
index e7459c8a1..11cc49477 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -8,7 +8,12 @@ os.environ["PORTAGE_CALLER"]="fixpackages"
 sys.path = ["/usr/lib/portage/pym"]+sys.path
 
 import portage
-portage.global_updates()
+
+mysettings = portage.settings
+mytrees = portage.db
+mtimedb = portage.mtimedb
+
+portage.global_updates(mysettings, mytrees, mtimedb["updates"])
 
 print
 print "Done."