diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-08-01 04:18:54 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-01 04:18:54 -0700 |
| commit | e7927bf7b80ac5b2b8cf53a9b6d300f47074a500 (patch) | |
| tree | fc0c06d977b1275f70ada2675b33a2072fa3edd3 | |
| parent | unmerge: fix false alarm about protected symlinks (diff) | |
| download | portage-e7927bf7b80ac5b2b8cf53a9b6d300f47074a500.tar.gz portage-e7927bf7b80ac5b2b8cf53a9b6d300f47074a500.tar.bz2 portage-e7927bf7b80ac5b2b8cf53a9b6d300f47074a500.zip | |
post_emerge: just return instead of sys.exit()
| -rw-r--r-- | pym/_emerge/main.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 28431c58f..283021460 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -308,7 +308,6 @@ def post_emerge(myaction, myopts, myfiles, Update News Items Commit mtimeDB Display preserved libs warnings - Exit Emerge @param myaction: The action returned from parse_opts() @type myaction: String @@ -324,9 +323,6 @@ def post_emerge(myaction, myopts, myfiles, @type mtimedb: MtimeDB class instance @param retval: Emerge's return value @type retval: Int - @rype: None - @returns: - 1. Calls sys.exit(retval) """ root_config = trees[target_root]["root_config"] @@ -357,7 +353,7 @@ def post_emerge(myaction, myopts, myfiles, if not vardbapi._pkgs_changed: display_news_notification(root_config, myopts) # If vdb state has not changed then there's nothing else to do. - sys.exit(retval) + return vdb_path = os.path.join(root_config.settings['EROOT'], portage.VDB_PATH) portage.util.ensure_dirs(vdb_path) @@ -396,8 +392,6 @@ def post_emerge(myaction, myopts, myfiles, myaction is None and "@world" in myfiles: show_depclean_suggestion() - sys.exit(retval) - def show_depclean_suggestion(): out = portage.output.EOutput() msg = "After world updates, it is important to remove " + \ |