Make automatic "global updates" always use the config instance that's associated...

svn path=/main/branches/2.1.2/; revision=6703

diff --git a/bin/emerge b/bin/emerge
index 7023f02a842d9b3f0cbe5050a74e53b6dd96d2fe..d472034278df7e04c67c2c88f9f4ca940bf848d1 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4225,7 +4225,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)
@@ -5261,7 +5261,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/bin/fixpackages b/bin/fixpackages
index 388a9ad44ce3bf70df9f8c143fe9646b48691d1c..39b81366283db0ddb47eaa2ec39c61eba30bc7c5 100755 (executable)
--- 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/portage.py b/pym/portage.py
index 16f105394c8dc40848485509624a8ff433821287..c08faf150029d149d6819df15ee59a6ddf77e94d 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8123,12 +8123,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
@@ -8142,6 +8140,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: