summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/fixpackages2
-rw-r--r--pym/emerge/__init__.py4
-rw-r--r--pym/portage/__init__.py5
3 files changed, 5 insertions, 6 deletions
diff --git a/bin/fixpackages b/bin/fixpackages
index 388a9ad44..39b813662 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -24,7 +24,7 @@ except (OSError, ValueError), e:
portage.writemsg("!!! %s\n" % str(e))
del e
-portage.global_updates(mysettings, mytrees, mtimedb["updates"])
+portage._global_updates(mytrees, mtimedb["updates"])
print
print "Done."
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 5189c6e2d..c653104a9 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4338,7 +4338,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
if os.path.exists(myportdir+"/metadata/cache") and updatecache_flg:
action_metadata(settings, portdb, myopts)
- if portage.global_updates(settings, trees, mtimedb["updates"]):
+ if portage._global_updates(trees, mtimedb["updates"]):
mtimedb.commit()
# Reload the whole config from scratch.
settings, trees, mtimedb = load_emerge_config(trees=trees)
@@ -5384,7 +5384,7 @@ def emerge_main():
portage.writemsg("!!! %s\n" % str(e))
del e
- if portage.global_updates(settings, trees, mtimedb["updates"]):
+ if portage._global_updates(trees, mtimedb["updates"]):
mtimedb.commit()
# Reload the whole config from scratch.
settings, trees, mtimedb = load_emerge_config(trees=trees)
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1448133f2..dda87bd71 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5009,12 +5009,10 @@ def portageexit():
atexit_register(portageexit)
-def global_updates(mysettings, trees, prev_mtimes):
+def _global_updates(trees, prev_mtimes):
"""
Perform new global updates if they exist in $PORTDIR/profiles/updates/.
- @param mysettings: A config instance for ROOT="/".
- @type mysettings: config
@param trees: A dictionary containing portage trees.
@type trees: dict
@param prev_mtimes: A dictionary containing mtimes of files located in
@@ -5028,6 +5026,7 @@ def global_updates(mysettings, trees, prev_mtimes):
global secpass
if secpass < 2 or "SANDBOX_ACTIVE" in os.environ:
return
+ mysettings = trees["/"]["vartree"].settings
updpath = os.path.join(mysettings["PORTDIR"], "profiles", "updates")
try: