post_emerge: just return instead of sys.exit()
authorZac Medico <zmedico@gentoo.org>
Mon, 1 Aug 2011 11:18:54 +0000 (04:18 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 1 Aug 2011 11:18:54 +0000 (04:18 -0700)
pym/_emerge/main.py

index 28431c58fc67fa1a4334c551faf562541755b3b0..283021460d7f720f81ec839d2b957cc2eabce093 100644 (file)
@@ -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 " + \