Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 363137 | Differences between
and this patch

Collapse All | Expand All

(-)a/man/emerge.1 (+5 lines)
Lines 437-442 This option is recommended for use in combination with \fB\-\-jobs\fR in Link Here
437
order to avoid excess load. See \fBmake\fR(1) for information about
437
order to avoid excess load. See \fBmake\fR(1) for information about
438
analogous options that should be configured via \fBMAKEOPTS\fR in
438
analogous options that should be configured via \fBMAKEOPTS\fR in
439
\fBmake.conf\fR(5).
439
\fBmake.conf\fR(5).
440
 .TP
441
+.BR "\-\-misspell-suggestions < y | n >"
442
Enable or disable misspell suggestions. By default emerge will return a 
443
list of packages with similar name, when a package given in argument 
444
doesn't exist.
440
.TP
445
.TP
441
.BR "\-\-newuse " (\fB\-N\fR)
446
.BR "\-\-newuse " (\fB\-N\fR)
442
Tells emerge to include installed packages where USE
447
Tells emerge to include installed packages where USE
(-)a/pym/_emerge/depgraph.py (-1 / +2 lines)
Lines 2741-2747 class depgraph(object): Link Here
2741
			mask_docs = True
2741
			mask_docs = True
2742
		else:
2742
		else:
2743
			writemsg_stdout("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1)
2743
			writemsg_stdout("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1)
2744
			if isinstance(myparent, AtomArg):
2744
			if self._frozen_config.myopts.get('--misspell-suggestions', 'y') == 'y' and \
2745
				isinstance(myparent, AtomArg):
2745
				cp = myparent.atom.cp.lower()
2746
				cp = myparent.atom.cp.lower()
2746
				cat, pkg = portage.catsplit(cp)
2747
				cat, pkg = portage.catsplit(cp)
2747
				if cat == "null":
2748
				if cat == "null":
(-)a/pym/_emerge/help.py (-3 / +13 lines)
Lines 17-27 def shorthelp(): Link Here
17
	print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]")
17
	print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]")
18
	print("          [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" >            ] [ "+green("--columns")+"    ]")
18
	print("          [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" >            ] [ "+green("--columns")+"    ]")
19
	print("          [ "+green("--complete-graph")+"             ] [ "+green("--deep")+"       ]")
19
	print("          [ "+green("--complete-graph")+"             ] [ "+green("--deep")+"       ]")
20
	print("          [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + "            ]")
20
	print("          [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + "              ]")
21
	print("          [ "+green("--newuse")+"    ] [ "+green("--noconfmem")+"  ] [ "+green("--nospinner")+"  ]")
21
	print("          [ "+green("--newuse")+"    ] [ "+green("--noconfmem")+"  ] [ "+green("--nospinner")+"  ]")
22
	print("          [ "+green("--oneshot")+"   ] [ "+green("--onlydeps")+"   ]")
22
	print("          [ "+green("--oneshot")+"   ] [ "+green("--onlydeps")+"   ] [ " + green("--misspell-suggestions")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]")
23
	print("          [ "+green("--reinstall ")+turquoise("changed-use")+"      ] [ " + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" >         ]")
23
	print("          [ "+green("--reinstall ")+turquoise("changed-use")+"      ] [ " + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" >         ]")
24
	print(bold("Actions:")+"  [ "+green("--depclean")+" | "+green("--list-sets")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+"        ]")
24
	print(bold("Actions:")+"  [ "+green("--depclean")+" | "+green("--list-sets")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+"          ]")
25
25
26
def help(myopts, havecolor=1):
26
def help(myopts, havecolor=1):
27
	# TODO: Implement a wrap() that accounts for console color escape codes.
27
	# TODO: Implement a wrap() that accounts for console color escape codes.
Lines 522-527 def help(myopts, havecolor=1): Link Here
522
		for line in wrap(desc, desc_width):
522
		for line in wrap(desc, desc_width):
523
			print(desc_indent + line)
523
			print(desc_indent + line)
524
		print()
524
		print()
525
		print("       " + green("--misspell-suggestions") + " [ %s | %s ]" % \
526
			(turquoise("y"), turquoise("n")))
527
		desc = "Enable or disable misspell suggestions. By default " + \
528
			"emerge will return a list of packages with similar " + \
529
			"name, when a package given in argument doesn't exist. " + \
530
			"PORTAGE_DEFAULT_OPT=\"--misspell-suggestions=n\" in " + \
531
			"make.conf disable this behavior"
532
		for line in wrap(desc, desc_width):
533
			print(desc_indent + line)
534
		print()
525
		print("       "+green("--noconfmem"))
535
		print("       "+green("--noconfmem"))
526
		print("              Portage keeps track of files that have been placed into")
536
		print("              Portage keeps track of files that have been placed into")
527
		print("              CONFIG_PROTECT directories, and normally it will not merge the")
537
		print("              CONFIG_PROTECT directories, and normally it will not merge the")
(-)a/pym/_emerge/main.py (-1 / +6 lines)
Lines 778-783 def parse_opts(tmpcmdline, silent=False): Link Here
778
			"choices"  : true_y_or_n
778
			"choices"  : true_y_or_n
779
		},
779
		},
780
780
781
		"--misspell-suggestions": {
782
			"help"     : "enable package name suggestions when not existing",
783
			"type"     : "choice",
784
			"choices"  : true_y_or_n
785
		},
786
781
	}
787
	}
782
788
783
	if _ENABLE_DYN_LINK_MAP:
789
	if _ENABLE_DYN_LINK_MAP:
784
- 

Return to bug 363137