From 6c6ac86ee1505015bd5f671e4ae6cdad8d7b53c1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 25 May 2008 03:59:35 +0000 Subject: Merge the Atom class and dbapi._iter_match() from trunk r10387 and r10394. Everything related to USE deps has been omitted for now. svn path=/main/branches/2.1.2/; revision=10403 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index fbc797a33..dafb3bb66 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3044,7 +3044,8 @@ class depgraph(object): # List of acceptable packages, ordered by type preference. matched_packages = [] highest_version = None - atom_cp = portage.dep_getkey(atom) + atom = portage_dep.Atom(atom) + atom_cp = atom.cp existing_node = None myeb = None usepkgonly = "--usepkgonly" in self.myopts -- cgit v1.2.3-1-g7c22