projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ada4417
)
slot_collision_handler: Fix function names broken by import changes
author
Sebastian Luther
<SebastianLuther@gmx.de>
Tue, 8 Jun 2010 10:12:24 +0000
(12:12 +0200)
committer
Zac Medico
<zmedico@gentoo.org>
Thu, 12 Aug 2010 08:17:24 +0000
(
01:17
-0700)
pym/_emerge/resolver/slot_collision.py
patch
|
blob
|
history
diff --git
a/pym/_emerge/resolver/slot_collision.py
b/pym/_emerge/resolver/slot_collision.py
index 81eb77ed21706a1a107474d85b27b50b0c5157d7..f4d5411b15debb11bf2e4de20cf09c6e79b6abec 100644
(file)
--- 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) \