From 6901e1d8c50a236cc5a6138751c2f29f748de7f5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 20 Dec 2010 07:53:43 -0800 Subject: saveNomergeFavorites: remove unecessary vars --- pym/_emerge/depgraph.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9a184d324..45a450df1 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5029,12 +5029,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 = x.type_name - root = x.root - pkg_key = x.cpv - pkg_status = x.operation - pkg_repo = x.repo - if pkg_status != "nomerge": + if x.operation != "nomerge": continue if x.root != root_config.root: @@ -5048,9 +5043,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: -- cgit v1.2.3-1-g7c22