From 2f245c5c04ef681b0280b743eff35ec8d0f8a597 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Jan 2009 23:42:31 +0000 Subject: Call depgraph._set_args() inside _load_favorites(), to eliminate duplicate code. (trunk r12520) svn path=/main/branches/2.1.6/; revision=12532 --- pym/_emerge/__init__.py | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 48a1e911a..ec62ac831 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8551,27 +8551,7 @@ class depgraph(object): args.append(AtomArg(arg=x, atom=x, root_config=root_config)) - # Create the "args" package set from atoms and - # packages given as arguments. - args_set = self._sets["args"] - for arg in args: - if not isinstance(arg, (AtomArg, PackageArg)): - continue - myatom = arg.atom - if myatom in args_set: - continue - args_set.add(myatom) - self._set_atoms.update(chain(*self._sets.itervalues())) - atom_arg_map = self._atom_arg_map - for arg in args: - for atom in arg.set: - atom_key = (atom, arg.root_config.root) - refs = atom_arg_map.get(atom_key) - if refs is None: - refs = [] - atom_arg_map[atom_key] = refs - if arg not in refs: - refs.append(arg) + self._set_args(args) return args class UnsatisfiedResumeDep(portage.exception.PortageException): -- cgit v1.2.3-1-g7c22