From 14ad718c2b1b7e985d68cf466904d4341ad59b0d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 24 Dec 2010 16:46:01 -0800 Subject: depgraph: Optimize --newuse with Package attrs. --- pym/_emerge/depgraph.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 76c1cb4ee..6d04e7811 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -55,7 +55,7 @@ from _emerge.UnmergeDepPriority import UnmergeDepPriority from _emerge.resolver.backtracking import Backtracker, BacktrackParameter from _emerge.resolver.slot_collision import slot_conflict_handler from _emerge.resolver.circular_dependency import circular_dependency_handler -from _emerge.resolver.output import Display, filter_iuse_defaults +from _emerge.resolver.output import Display if sys.hexversion >= 0x3000000: basestring = str @@ -3108,9 +3108,9 @@ class depgraph(object): forced_flags = set() forced_flags.update(pkg.use.force) forced_flags.update(pkg.use.mask) - old_use = vardb.aux_get(cpv, ["USE"])[0].split() - old_iuse = set(filter_iuse_defaults( - vardb.aux_get(cpv, ["IUSE"])[0].split())) + inst_pkg = vardb.match_pkgs('=' + pkg.cpv)[0] + old_use = inst_pkg.use.enabled + old_iuse = inst_pkg.iuse.all cur_use = self._pkg_use_enabled(pkg) cur_iuse = pkg.iuse.all reinstall_for_flags = \ -- cgit v1.2.3-1-g7c22