From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B7A93138010 for ; Mon, 15 Oct 2012 15:42:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5DE9E04C8; Mon, 15 Oct 2012 15:42:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5BC0AE04C8 for ; Mon, 15 Oct 2012 15:42:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 744CF33D0AF for ; Mon, 15 Oct 2012 15:42:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1796FE5436 for ; Mon, 15 Oct 2012 15:42:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1350315724.158440e153b898159ca525016d46bb0a161c49e0.zmedico@gentoo> 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: 158440e153b898159ca525016d46bb0a161c49e0 X-VCS-Branch: master Date: Mon, 15 Oct 2012 15:42:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 028a6ef5-2404-420c-bdae-312b75434702 X-Archives-Hash: 7c7f59983a8c7e708c809fc26308bcff commit: 158440e153b898159ca525016d46bb0a161c49e0 Author: Zac Medico gentoo org> AuthorDate: Mon Oct 15 15:42:04 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 15 15:42:04 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=158440e1 emerge_main: move imports to top --- pym/_emerge/main.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index bba10b7..eed3999 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -10,6 +10,7 @@ import sys import portage portage.proxy.lazyimport.lazyimport(globals(), 'logging', + 'portage.debug', 'portage.dbapi.dep_expand:dep_expand', 'portage.news:count_unread_news,display_news_notifications', 'portage.emaint.modules.logs.logs:CleanLogs', @@ -1635,8 +1636,7 @@ def emerge_main(args=None): spinner.update = spinner.update_quiet portage.util.noiselimit = 0 if "python-trace" in settings.features: - import portage.debug as portage_debug - portage_debug.set_trace(True) + portage.debug.set_trace(True) if not ("--quiet" in myopts): if '--nospinner' in myopts or \ @@ -1673,12 +1673,11 @@ def emerge_main(args=None): access_desc = "portage group" # Always show portage_group_warning() when only portage group # access is required but the user is not in the portage group. - from portage.data import portage_group_warning if "--ask" in myopts: writemsg_stdout("This action requires %s access...\n" % \ (access_desc,), noiselevel=-1) if portage.secpass < 1 and not need_superuser: - portage_group_warning() + portage.data.portage_group_warning() if userquery("Would you like to add --pretend to options?", "--ask-enter-invalid" in myopts) == "No": return 128 + signal.SIGINT @@ -1688,7 +1687,7 @@ def emerge_main(args=None): sys.stderr.write(("emerge: %s access is required\n") \ % access_desc) if portage.secpass < 1 and not need_superuser: - portage_group_warning() + portage.data.portage_group_warning() return 1 # Disable emergelog for everything except build or unmerge operations.