[gentoo-commits] proj/portage:master commit in: lib/portage/tests/dbapi/, lib/portage/cache/

[Zac Medico]

commit:     687dbcb0ab2f7d254bdc53b1332b3d480b2de581
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat May  2 20:51:15 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat May  2 21:04:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=687dbcb0

anydbm: avoid interference between cleanse_keys and _eclasses_

Fix this AuxdbTestCase failure for anydbm:

test_anydbm (portage.tests.dbapi.test_auxdb.AuxdbTestCase) ... Exception in 
callback None()
handle: <Handle cancelled>
Traceback (most recent call last):
  File "/usr/lib64/python3.6/asyncio/events.py", line 145, in _run
    self._callback(*self._args)
  File "lib/_emerge/EbuildMetadataPhase.py", line 143, in _output_handler
    self._async_waitpid()
  File "lib/_emerge/SubProcess.py", line 60, in _async_waitpid
    add_child_handler(self.pid, self._async_waitpid_cb)
  File "/usr/lib64/python3.6/asyncio/unix_events.py", line 873, in 
add_child_handler
    self._do_waitpid(pid)
  File "/usr/lib64/python3.6/asyncio/unix_events.py", line 919, in _do_waitpid
    callback(pid, returncode, *args)
  File "lib/_emerge/EbuildMetadataPhase.py", line 207, in _async_waitpid_cb
    self.repo_path, metadata, self.ebuild_hash)
  File "lib/portage/dbapi/porttree.py", line 545, in _write_cache
    cache[cpv] = metadata
  File "lib/portage/cache/template.py", line 146, in __setitem__
    d["_eclasses_"] = self._internal_eclasses(d["_eclasses_"],
  File "lib/portage/cache/mappings.py", line 213, in __getitem__
    raise KeyError(key)
KeyError: '_eclasses_'

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/cache/template.py         | 2 +-
 lib/portage/tests/dbapi/test_auxdb.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/portage/cache/template.py b/lib/portage/cache/template.py
index 8662d859f..6b4878347 100644
--- a/lib/portage/cache/template.py
+++ b/lib/portage/cache/template.py
@@ -133,7 +133,7 @@ class database(object):
                d = None
                if self.cleanse_keys:
                        d=ProtectedDict(values)
-                       for k, v in list(d.items()):
+                       for k, v in list(item for item in d.items() if item[0] 
!= "_eclasses_"):
                                if not v:
                                        del d[k]
                if "_eclasses_" in values:

diff --git a/lib/portage/tests/dbapi/test_auxdb.py 
b/lib/portage/tests/dbapi/test_auxdb.py
index 73fc2b2c3..cfcabc8bb 100644
--- a/lib/portage/tests/dbapi/test_auxdb.py
+++ b/lib/portage/tests/dbapi/test_auxdb.py
@@ -11,6 +11,13 @@ from portage.util.futures.compat_coroutine import coroutine
 
 class AuxdbTestCase(TestCase):
 
+       def test_anydbm(self):
+               try:
+                       from portage.cache.anydbm import database
+               except ImportError:
+                       self.skipTest('dbm import failed')
+               self._test_mod('portage.cache.anydbm.database')
+
        def test_flat_hash_md5(self):
                self._test_mod('portage.cache.flat_hash.md5_database')