diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-21 16:35:14 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-21 19:12:45 -0800 |
| commit | 5280f456a8b999655a4e94c22da9589931703a67 (patch) | |
| tree | d26e23ccb3a003f4742939d8daab7c08f2412200 /pym/_emerge | |
| parent | 4bd18a61c46c26496ffc80ef95e80d82dcc8500a (diff) | |
| download | portage-5280f456a8b999655a4e94c22da9589931703a67.tar.gz portage-5280f456a8b999655a4e94c22da9589931703a67.tar.bz2 portage-5280f456a8b999655a4e94c22da9589931703a67.zip | |
post_emerge: pass in more info
This makes it possible to do things like give special suggestions after
world updates.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/main.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index f0f44b5a2..267254c78 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -292,7 +292,8 @@ def display_preserved_libs(vardbapi, myopts): print(colorize("WARN", " * ") + " used by %d other files" % (len(consumers) - MAX_DISPLAY)) print("Use " + colorize("GOOD", "emerge @preserved-rebuild") + " to rebuild packages using these libraries") -def post_emerge(root_config, myopts, mtimedb, retval): +def post_emerge(myaction, myopts, myfiles, + target_root, trees, mtimedb, retval): """ Misc. things to run at the end of a merge session. @@ -303,6 +304,14 @@ def post_emerge(root_config, myopts, mtimedb, retval): Display preserved libs warnings Exit Emerge + @param myaction: The action returned from parse_opts() + @type myaction: String + @param myopts: emerge options + @type myopts: dict + @param myfiles: emerge arguments + @type myfiles: list + @param target_root: The target ROOT for myaction + @type target_root: String @param trees: A dictionary mapping each ROOT to it's package databases @type trees: dict @param mtimedb: The mtimeDB to store data needed across merge invocations @@ -314,8 +323,7 @@ def post_emerge(root_config, myopts, mtimedb, retval): 1. Calls sys.exit(retval) """ - target_root = root_config.root - trees = { target_root : root_config.trees } + root_config = trees[target_root]["root_config"] vardbapi = trees[target_root]["vartree"].dbapi settings = vardbapi.settings info_mtimes = mtimedb["info"] @@ -1637,7 +1645,8 @@ def emerge_main(): rval = action_uninstall(settings, trees, mtimedb["ldpath"], myopts, myaction, myfiles, spinner) if not (myaction == 'deselect' or buildpkgonly or fetchonly or pretend): - post_emerge(root_config, myopts, mtimedb, rval) + post_emerge(myaction, myopts, myfiles, settings["ROOT"], + trees, mtimedb, rval) return rval elif myaction == 'info': @@ -1708,7 +1717,7 @@ def emerge_main(): display_news_notification(root_config, myopts) retval = action_build(settings, trees, mtimedb, myopts, myaction, myfiles, spinner) - root_config = trees[settings["ROOT"]]["root_config"] - post_emerge(root_config, myopts, mtimedb, retval) + post_emerge(myaction, myopts, myfiles, settings["ROOT"], + trees, mtimedb, retval) return retval |