From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnqYr-00081J-6J for garchives@archives.gentoo.org; Mon, 01 Aug 2011 11:21:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C486E21C16F; Mon, 1 Aug 2011 11:21:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 962C421C16F for ; Mon, 1 Aug 2011 11:21:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE7301B4023 for ; Mon, 1 Aug 2011 11:21:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5D1333C004 for ; Mon, 1 Aug 2011 11:21:09 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e7927bf7b80ac5b2b8cf53a9b6d300f47074a500 Date: Mon, 1 Aug 2011 11:21:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2d8dfaa86d4baed9e8dbd63196c170f5 commit: e7927bf7b80ac5b2b8cf53a9b6d300f47074a500 Author: Zac Medico gentoo org> AuthorDate: Mon Aug 1 11:18:54 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 1 11:18:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De7927bf7 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 =20 @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) """ =20 root_config =3D 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 =20 vdb_path =3D os.path.join(root_config.settings['EROOT'], portage.VDB_PA= TH) 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() =20 - sys.exit(retval) - def show_depclean_suggestion(): out =3D portage.output.EOutput() msg =3D "After world updates, it is important to remove " + \