From 0aa1670634921e27f77b13f23e145d02dc3df468 Mon Sep 17 00:00:00 2001 From: Samuel BAUER Date: Thu, 14 Apr 2011 15:23:07 +0700 Subject: [PATCH] Added misspell-suggestion as an option rather than a feature --- pym/_emerge/depgraph.py | 3 ++- pym/_emerge/help.py | 2 +- pym/_emerge/main.py | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 391c845..1bc1ee6 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2741,7 +2741,8 @@ class depgraph(object): mask_docs = True else: writemsg_stdout("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1) - if isinstance(myparent, AtomArg): + if self._frozen_config.myopts.get('--misspell-suggestions', 'y') == 'y' and \ + isinstance(myparent, AtomArg): cp = myparent.atom.cp.lower() cat, pkg = portage.catsplit(cp) if cat == "null": diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index a120f54..84e9e3c 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -19,7 +19,7 @@ def shorthelp(): print(" [ "+green("--complete-graph")+" ] [ "+green("--deep")+" ]") print(" [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + " ]") print(" [ "+green("--newuse")+" ] [ "+green("--noconfmem")+" ] [ "+green("--nospinner")+" ]") - print(" [ "+green("--oneshot")+" ] [ "+green("--onlydeps")+" ]") + print(" [ "+green("--oneshot")+" ] [ "+green("--onlydeps")+" ] [ " + green("--misspell-suggestions")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]") print(" [ "+green("--reinstall ")+turquoise("changed-use")+" ] [ " + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]") print(bold("Actions:")+" [ "+green("--depclean")+" | "+green("--list-sets")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+" ]") diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 96fee89..a349ed7 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -778,6 +778,12 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n }, + "--misspell-suggestions": { + "help" : "enable package name suggestions when not existing", + "type" : "choice", + "choices" : true_y_or_n + }, + } if _ENABLE_DYN_LINK_MAP: -- 1.7.3.4