diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-20 07:53:43 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-20 07:56:39 -0800 |
| commit | 6222d0b0bf13cbbfac8e9a30c98f6ff9f40dc938 (patch) | |
| tree | 620eb3c5fadedfcdac321b1c83b153ebc81b5020 | |
| parent | f1147977596d380bcedc90d36f84ee4dc825377b (diff) | |
| download | portage-6222d0b0bf13cbbfac8e9a30c98f6ff9f40dc938.tar.gz portage-6222d0b0bf13cbbfac8e9a30c98f6ff9f40dc938.tar.bz2 portage-6222d0b0bf13cbbfac8e9a30c98f6ff9f40dc938.zip | |
saveNomergeFavorites: remove unecessary vars
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 74b835523..0316a9863 100644 --- 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: |