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/dbapi | |
| 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/dbapi')
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 4 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 321b6758a..e21e53ce6 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -155,10 +155,10 @@ class portdbapi(dbapi): # portage group. depcachedir_unshared = True else: - cache_kwargs.update({ + cache_kwargs.update(portage._native_kwargs({ 'gid' : portage_gid, 'perms' : 0o664 - }) + })) # If secpass < 1, we don't want to write to the cache # since then we won't be able to apply group permissions diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 30add8a89..20a114bda 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4837,7 +4837,8 @@ class dblink(object): else: kwargs['mode'] = 'w' kwargs['encoding'] = _encodings['repo.content'] - write_atomic(os.path.join(self.dbdir, fname), data, **kwargs) + write_atomic(os.path.join(self.dbdir, fname), data, + **portage._native_kwargs(kwargs)) def getelements(self,ename): if not os.path.exists(self.dbdir+"/"+ename): |