From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 14 Jan 2009 21:37:38 +0000 (-0000)
Subject: Call depgraph._set_args() inside _load_favorites(), to eliminate duplicate
X-Git-Tag: v2.2_rc23~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32b12d5d73812819dddbe1345b23048c97113478;p=portage.git

Call depgraph._set_args() inside _load_favorites(), to eliminate duplicate
code.

svn path=/main/trunk/; revision=12520
---

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):