[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Zac Medico]

commit:     e7927bf7b80ac5b2b8cf53a9b6d300f47074a500
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 11:18:54 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 11:18:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e7927bf7

post_emerge: just return instead of sys.exit()

---
 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 28431c5..2830214 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 " + \