diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-06-08 12:12:24 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-12 01:17:24 -0700 |
| commit | 65df7762b61ef6072ad48a159e0f35d80a5146dc (patch) | |
| tree | 11b4e816986a0c4886d798e339c01b1b00697f34 | |
| parent | ada441750cbca93503ab611d8ea13e666e9bdabf (diff) | |
| download | portage-65df7762b61ef6072ad48a159e0f35d80a5146dc.tar.gz portage-65df7762b61ef6072ad48a159e0f35d80a5146dc.tar.bz2 portage-65df7762b61ef6072ad48a159e0f35d80a5146dc.zip | |
slot_collision_handler: Fix function names broken by import changes
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index 81eb77ed2..f4d5411b1 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -172,9 +172,9 @@ class slot_conflict_handler(object): best_matches = {} for ppkg, atom, other_pkg in parents: if atom.cp in best_matches: - cmp = portage.versions.vercmp( \ - portage.versions.cpv_getversion(atom.cpv), \ - portage.versions.cpv_getversion(best_matches[atom.cp][1].cpv)) + cmp = vercmp( \ + cpv_getversion(atom.cpv), \ + cpv_getversion(best_matches[atom.cp][1].cpv)) if (sub_type == "ge" and cmp > 0) \ or (sub_type == "le" and cmp < 0) \ |