Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:multilib commit in: pym/_emerge/
Date: Sun, 06 Feb 2011 13:15:20
Message-Id: f3827387522ab3c9fef1c8d5efb56f2eb3e75731.tommy@gentoo
1 commit: f3827387522ab3c9fef1c8d5efb56f2eb3e75731
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 3 07:39:09 2011 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 3 07:39:09 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f3827387
7
8 depgraph: use catsplit where appropriate
9
10 ---
11 pym/_emerge/depgraph.py | 4 ++--
12 1 files changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
15 index 27a854b..8f04c44 100644
16 --- a/pym/_emerge/depgraph.py
17 +++ b/pym/_emerge/depgraph.py
18 @@ -2624,7 +2624,7 @@ class depgraph(object):
19 writemsg_stdout("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1)
20 if isinstance(myparent, AtomArg):
21 cp = myparent.atom.cp
22 - cat, pkg = cp.split("/")
23 + cat, pkg = portage.catsplit(cp)
24 if cat == "null":
25 cat = None
26
27 @@ -2642,7 +2642,7 @@ class depgraph(object):
28 else:
29 pkg_to_cp = {}
30 for other_cp in all_cp:
31 - other_pkg = other_cp.split("/")[1]
32 + other_pkg = portage.catsplit(other_cp)[1]
33 pkg_to_cp.setdefault(other_pkg, set()).add(other_cp)
34 pkg_matches = difflib.get_close_matches(pkg, pkg_to_cp)
35 matches = []