diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-04-28 03:03:30 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-04-28 03:03:30 +0000 |
commit | 5f8c75a752e5ea8f4d58cb507075d6188956b026 (patch) | |
tree | 08bd428fd3f1de81d0166114329406fa7be6a328 /bin | |
parent | 7ddf0f55b83c6d6519685fd99e107e9d2113c18e (diff) | |
download | portage-5f8c75a752e5ea8f4d58cb507075d6188956b026.tar.gz portage-5f8c75a752e5ea8f4d58cb507075d6188956b026.tar.bz2 portage-5f8c75a752e5ea8f4d58cb507075d6188956b026.zip |
Fix portage.global_updates() and portage.do_vartree() so they don't have to use any globals.
svn path=/main/trunk/; revision=3253
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/emerge | 4 | ||||
-rwxr-xr-x | bin/fixpackages | 7 |
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." |