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 DB25B138943 for ; Sat, 9 Feb 2013 18:00:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 660DF21C0BC; Sat, 9 Feb 2013 18:00: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 E582E21C0BC for ; Sat, 9 Feb 2013 18:00: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 D40F833E2B6 for ; Sat, 9 Feb 2013 18:00:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 196C7E4073 for ; Sat, 9 Feb 2013 18:00:45 +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: <1360432739.02d4bc55e96e01f4e7c5aeea3e52cdd28d69c120.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 02d4bc55e96e01f4e7c5aeea3e52cdd28d69c120 X-VCS-Branch: master Date: Sat, 9 Feb 2013 18:00:45 +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: b14dd207-0886-4732-9a58-f1aa01e11a74 X-Archives-Hash: 4b6ad59ac6bdb1b3085bfad4d2572854 commit: 02d4bc55e96e01f4e7c5aeea3e52cdd28d69c120 Author: Zac Medico gentoo org> AuthorDate: Sat Feb 9 17:58:59 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 9 17:58:59 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=02d4bc55 emerge --sync: python 2.6.4 compat, bug #456236 Avoid "TypeError: keywords must be strings" issue triggered by unicode_literals: http://bugs.python.org/issue4978 Also see commit e9a04922c144b267534e3335d2ff3d7bb8994b80. --- pym/_emerge/actions.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 0776f7b..b8cb2cd 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2109,7 +2109,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): emergelog(xterm_titles, msg ) writemsg_level(msg + "\n") exitcode = portage.process.spawn_bash("cd %s ; git pull" % \ - (portage._shell_quote(myportdir),), **spawn_kwargs) + (portage._shell_quote(myportdir),), + **portage._native_kwargs(spawn_kwargs)) if exitcode != os.EX_OK: msg = "!!! git pull error in %s." % myportdir emergelog(xterm_titles, msg) @@ -2398,7 +2399,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): rsync_initial_timeout) mypids.extend(portage.process.spawn( - mycommand, returnpid=True, **spawn_kwargs)) + mycommand, returnpid=True, + **portage._native_kwargs(spawn_kwargs))) exitcode = os.waitpid(mypids[0], 0)[1] if usersync_uid is not None: portage.util.apply_permissions(tmpservertimestampfile, @@ -2464,7 +2466,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): elif (servertimestamp == 0) or (servertimestamp > mytimestamp): # actual sync mycommand = rsynccommand + [dosyncuri+"/", myportdir] - exitcode = portage.process.spawn(mycommand, **spawn_kwargs) + exitcode = portage.process.spawn(mycommand, + **portage._native_kwargs(spawn_kwargs)) if exitcode in [0,1,3,4,11,14,20,21]: break elif exitcode in [1,3,4,11,14,20,21]: @@ -2542,7 +2545,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): if portage.process.spawn_bash( "cd %s; exec cvs -z0 -d %s co -P gentoo-x86" % \ (portage._shell_quote(cvsdir), portage._shell_quote(cvsroot)), - **spawn_kwargs) != os.EX_OK: + **portage._native_kwargs(spawn_kwargs)) != os.EX_OK: print("!!! cvs checkout error; exiting.") sys.exit(1) os.rename(os.path.join(cvsdir, "gentoo-x86"), myportdir) @@ -2551,7 +2554,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): print(">>> Starting cvs update with "+syncuri+"...") retval = portage.process.spawn_bash( "cd %s; exec cvs -z0 -q update -dP" % \ - (portage._shell_quote(myportdir),), **spawn_kwargs) + (portage._shell_quote(myportdir),), + **portage._native_kwargs(spawn_kwargs)) if retval != os.EX_OK: writemsg_level("!!! cvs update error; exiting.\n", noiselevel=-1, level=logging.ERROR) @@ -3133,7 +3137,7 @@ def load_emerge_config(trees=None): v = os.environ.get(envvar, None) if v and v.strip(): kwargs[k] = v - trees = portage.create_trees(trees=trees, **kwargs) + trees = portage.create_trees(trees=trees, **portage._native_kwargs(kwargs)) for root_trees in trees.values(): settings = root_trees["vartree"].settings