summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-14 21:37:38 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-14 21:37:38 +0000
commit32b12d5d73812819dddbe1345b23048c97113478 (patch)
tree08d04bbb4f67b6e28ecb93338c971e55bb3228b1
parentd6b1546f6c2f5bb5a04126f96ec968de9a114efb (diff)
downloadportage-32b12d5d73812819dddbe1345b23048c97113478.tar.gz
portage-32b12d5d73812819dddbe1345b23048c97113478.tar.bz2
portage-32b12d5d73812819dddbe1345b23048c97113478.zip
Call depgraph._set_args() inside _load_favorites(), to eliminate duplicate
code. svn path=/main/trunk/; revision=12520
-rw-r--r--pym/_emerge/__init__.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 991cb2d85..814ce7052 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8567,27 +8567,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):