diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-25 03:59:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-25 03:59:35 +0000 |
| commit | 6c6ac86ee1505015bd5f671e4ae6cdad8d7b53c1 (patch) | |
| tree | 122325584e45e0e748844c12608b8c81c3781cc8 /bin/emerge | |
| parent | ddfd90ccf7aa26c18c29d8aa82c38f384fe3b9a6 (diff) | |
| download | portage-6c6ac86ee1505015bd5f671e4ae6cdad8d7b53c1.tar.gz portage-6c6ac86ee1505015bd5f671e4ae6cdad8d7b53c1.tar.bz2 portage-6c6ac86ee1505015bd5f671e4ae6cdad8d7b53c1.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
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 |