Pass settings to _pkg_str constructor.

Forgotten in commit 0b4e6c27e87e57fac09fa28d3ed1320cb6a83ad9.

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 9babb4c7b54e53e59337f5f2a828e4c2d13435be..17c95ac0ce4d0805f38897860ec3bdc0caa088bc 100644 (file)
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -290,7 +290,7 @@ def perform_global_updates(mycpv, mydb, myupdates):
        aux_keys = Package._dep_keys + mydb._pkg_str_aux_keys
        aux_dict = dict(zip(aux_keys, mydb.aux_get(mycpv, aux_keys)))
        try:
-               pkg = _pkg_str(mycpv, metadata=aux_dict)
+               pkg = _pkg_str(mycpv, metadata=aux_dict, settings=mydb.settings)
        except InvalidData:
                return
        aux_dict = dict((k, aux_dict[k]) for k in Package._dep_keys)

diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py
index c6bdbc77a37210d5f9f254775124f045022f1794..49b72937df64485096717f360b07ec4a3e47839f 100644 (file)
--- a/pym/portage/dbapi/__init__.py
+++ b/pym/portage/dbapi/__init__.py
@@ -301,9 +301,12 @@ class dbapi(object):
                if onProgress:
                        onProgress(maxval, 0)
                for i, cpv in enumerate(cpv_all):
-                       metadata = dict(zip(meta_keys, aux_get(cpv, meta_keys)))
                        try:
-                               pkg = _pkg_str(cpv, metadata=metadata)
+                               metadata = dict(zip(meta_keys, aux_get(cpv, meta_keys)))
+                       except KeyError:
+                               continue
+                       try:
+                               pkg = _pkg_str(cpv, metadata=metadata, settings=self.settings)
                        except InvalidData:
                                continue
                        metadata = dict((k, metadata[k]) for k in update_keys)

diff --git a/pym/portage/emaint/modules/move/move.py b/pym/portage/emaint/modules/move/move.py
index 607fbc42b64fa2e6d189ece046504b64b81911e6..ef674d47afdd427c1e1e702dce29bc0ddd4db3ed 100644 (file)
--- a/pym/portage/emaint/modules/move/move.py
+++ b/pym/portage/emaint/modules/move/move.py
@@ -51,6 +51,7 @@ class MoveHandler(object):
                match = self._tree.dbapi.match
                aux_get = self._tree.dbapi.aux_get
                pkg_str = self._tree.dbapi._pkg_str
+               settings = self._tree.dbapi.settings
                if onProgress:
                        onProgress(0, 0)
                for repo, updates in allupdates.items():
@@ -97,9 +98,12 @@ class MoveHandler(object):
                if onProgress:
                        onProgress(maxval, 0)
                for i, cpv in enumerate(cpv_all):
-                       metadata = dict(zip(meta_keys, aux_get(cpv, meta_keys)))
                        try:
-                               pkg = _pkg_str(cpv, metadata=metadata)
+                               metadata = dict(zip(meta_keys, aux_get(cpv, meta_keys)))
+                       except KeyError:
+                               continue
+                       try:
+                               pkg = _pkg_str(cpv, metadata=metadata, settings=settings)
                        except InvalidData:
                                continue
                        metadata = dict((k, metadata[k]) for k in self._update_keys)