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 809881381F3 for ; Thu, 6 Dec 2012 02:34:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55241E0517; Thu, 6 Dec 2012 02:34:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEDD3E0517 for ; Thu, 6 Dec 2012 02:34:48 +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 D7BBC33D8A3 for ; Thu, 6 Dec 2012 02:34:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6D32EE5436 for ; Thu, 6 Dec 2012 02:34:46 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1354761272.0ec6895a3679afa59a751c2259afade1620108fa.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/actions.py gobs/pym/main.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 0ec6895a3679afa59a751c2259afade1620108fa X-VCS-Branch: master Date: Thu, 6 Dec 2012 02:34:46 +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: d25ed841-4b8c-4442-b604-13acd6bfd71d X-Archives-Hash: 728a58949e7d8c1f783e3e64f2c4b53c commit: 0ec6895a3679afa59a751c2259afade1620108fa Author: Magnus Granberg gentoo org> AuthorDate: Thu Dec 6 02:34:32 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Thu Dec 6 02:34:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=0ec6895a move build_dict in run_action --- gobs/pym/actions.py | 4 ++-- gobs/pym/main.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gobs/pym/actions.py b/gobs/pym/actions.py index a3a158c..a27c5f9 100644 --- a/gobs/pym/actions.py +++ b/gobs/pym/actions.py @@ -3475,8 +3475,8 @@ def repo_name_duplicate_check(trees): return bool(ignored_repos) -def run_action(settings, trees, mtimedb, myaction, myopts, myfiles, - gc_locals=None, build_dict): +def run_action(settings, trees, mtimedb, myaction, myopts, myfiles, build_dict, + gc_locals=None): # The caller may have its local variables garbage collected, so # they don't consume any memory during this long-running function. diff --git a/gobs/pym/main.py b/gobs/pym/main.py index d6e6f21..4bc45ee 100644 --- a/gobs/pym/main.py +++ b/gobs/pym/main.py @@ -966,14 +966,19 @@ def profile_check(trees, myaction): return 1 return os.EX_OK -def emerge_main(args=None, build_dict={}): +def emerge_main(args=None, build_dict=None): """ @param args: command arguments (default: sys.argv[1:]) @type args: list + @param build_dict: info of the build_job + @type build_dict: dict """ if args is None: args = sys.argv[1:] + if build_dict is None: + build_dict = {} + portage._disable_legacy_globals() portage._internal_warnings = True # Disable color until we're sure that it should be enabled (after @@ -1017,5 +1022,5 @@ def emerge_main(args=None, build_dict={}): tmpcmdline.extend(args) myaction, myopts, myfiles = parse_opts(tmpcmdline) - return run_action(settings, trees, mtimedb, myaction, myopts, myfiles, - gc_locals=locals().clear, build_dict) + return run_action(settings, trees, mtimedb, myaction, myopts, myfiles, build_dict, + gc_locals=locals().clear)