diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-18 15:05:42 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-18 15:05:42 -0800 |
| commit | e9a04922c144b267534e3335d2ff3d7bb8994b80 (patch) | |
| tree | 0c43dc33336066103b605bc7441ac94bc85575b9 /pym/portage/package | |
| parent | 71235479ab208318dff391420f9695f5cfaa9594 (diff) | |
| download | portage-e9a04922c144b267534e3335d2ff3d7bb8994b80.tar.gz portage-e9a04922c144b267534e3335d2ff3d7bb8994b80.tar.bz2 portage-e9a04922c144b267534e3335d2ff3d7bb8994b80.zip | |
Add workaround for Python 2.6.4 issue 4978
Avoid "TypeError: keywords must be strings" issue triggered
by unicode_literals: http://bugs.python.org/issue4978
Diffstat (limited to 'pym/portage/package')
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 3e8ff0138..71a6f156f 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -135,7 +135,7 @@ def _doebuild_spawn(phase, settings, actionmap=None, **kwargs): settings['EBUILD_PHASE'] = phase try: - return spawn(cmd, settings, **kwargs) + return spawn(cmd, settings, **portage._native_kwargs(kwargs)) finally: settings.pop('EBUILD_PHASE', None) @@ -1453,14 +1453,15 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero mysettings["PORTAGE_SANDBOX_T"]) if keywords.get("returnpid"): - return spawn_func(mystring, env=mysettings.environ(), **keywords) + return spawn_func(mystring, env=mysettings.environ(), + **portage._native_kwargs(keywords)) proc = EbuildSpawnProcess( background=False, args=mystring, scheduler=SchedulerInterface(portage._internal_caller and global_event_loop() or EventLoop(main=False)), spawn_func=spawn_func, - settings=mysettings, **keywords) + settings=mysettings, **portage._native_kwargs(keywords)) proc.start() proc.wait() |