saveNomergeFavorites: remove unecessary vars

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 74b835523992c931c7f6f0ed00c36746b0360794..0316a98632dbd94296340a62495e6c72da634719 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4984,8 +4984,7 @@ class depgraph(object):
                portdb = self._frozen_config.trees[self._frozen_config.target_root]["porttree"].dbapi
                added_favorites = set()
                for x in self._dynamic_config._set_nodes:
-                       pkg_type, root, pkg_key, pkg_status = x
-                       if pkg_status != "nomerge":
+                       if x.operation != "nomerge":
                                continue
 
                        if x.root != root_config.root:
@@ -4999,9 +4998,9 @@ class depgraph(object):
                                        added_favorites.add(myfavkey)
                        except portage.exception.InvalidDependString as e:
                                writemsg("\n\n!!! '%s' has invalid PROVIDE: %s\n" % \
-                                       (pkg_key, str(e)), noiselevel=-1)
+                                       (x.cpv, e), noiselevel=-1)
                                writemsg("!!! see '%s'\n\n" % os.path.join(
-                                       root, portage.VDB_PATH, pkg_key, "PROVIDE"), noiselevel=-1)
+                                       x.root, portage.VDB_PATH, x.cpv, "PROVIDE"), noiselevel=-1)
                                del e
                all_added = []
                for arg in self._dynamic_config._initial_arg_list: