| 1 |
commit: 7181cfe1c40071b4c0d8446fcd12d9aecd622a11 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 31 23:44:55 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 31 23:44:55 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7181cfe1 |
| 7 |
|
| 8 |
depgraph: display 'searching for similar names' |
| 9 |
|
| 10 |
It can take few seconds to search, so display a status message. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/depgraph.py | 14 +++++++++++--- |
| 14 |
1 files changed, 11 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 17 |
index 39c6395..64e9b19 100644 |
| 18 |
--- a/pym/_emerge/depgraph.py |
| 19 |
+++ b/pym/_emerge/depgraph.py |
| 20 |
@@ -2619,6 +2619,9 @@ class depgraph(object): |
| 21 |
if cat == "null": |
| 22 |
cat = None |
| 23 |
|
| 24 |
+ writemsg_stdout("\nemerge: searching for similar names..." |
| 25 |
+ , noiselevel=-1) |
| 26 |
+ |
| 27 |
all_cp = set() |
| 28 |
all_cp.update(vardb.cp_all()) |
| 29 |
all_cp.update(portdb.cp_all()) |
| 30 |
@@ -2638,12 +2641,17 @@ class depgraph(object): |
| 31 |
matches.extend(pkg_to_cp[pkg_match]) |
| 32 |
|
| 33 |
if len(matches) == 1: |
| 34 |
- writemsg_stdout("emerge: Maybe you meant " + matches[0] + "?\n" |
| 35 |
+ writemsg_stdout("\nemerge: Maybe you meant " + matches[0] + "?\n" |
| 36 |
, noiselevel=-1) |
| 37 |
elif len(matches) > 1: |
| 38 |
- writemsg_stdout("emerge: Maybe you meant any of these: " + ", ".join(matches) + "?\n" |
| 39 |
+ writemsg_stdout( |
| 40 |
+ "\nemerge: Maybe you meant any of these: %s?\n" % \ |
| 41 |
+ (", ".join(matches),), noiselevel=-1) |
| 42 |
+ else: |
| 43 |
+ # Generally, this would only happen if |
| 44 |
+ # all dbapis are empty. |
| 45 |
+ writemsg_stdout(" nothing similar found.\n" |
| 46 |
, noiselevel=-1) |
| 47 |
- |
| 48 |
msg = [] |
| 49 |
if not isinstance(myparent, AtomArg): |
| 50 |
# It's redundant to show parent for AtomArg since |
Archives