From 65df7762b61ef6072ad48a159e0f35d80a5146dc Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Tue, 8 Jun 2010 12:12:24 +0200 Subject: [PATCH] slot_collision_handler: Fix function names broken by import changes --- pym/_emerge/resolver/slot_collision.py | 6 +++--- 1 file 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) \ -- 2.26.2