Attachment #269699 for bug #363137

Lines 52-60 FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho Link Here

(-)a/portage/cnf/make.globals (-3 / +4 lines)
52		52
53	# Default user options	53	# Default user options
54	FEATURES="assume-digests binpkg-logs distlocks fixpackages	54	FEATURES="assume-digests binpkg-logs distlocks fixpackages
55	fixlafiles news parallel-fetch protect-owned	55	fixlafiles news misspell-suggestions parallel-fetch
56	sandbox sfperms strict unknown-features-warn unmerge-logs	56	protect-owned sandbox sfperms strict
57	unmerge-orphans userfetch"	57	unknown-features-warn unmerge-logs unmerge-orphans
		58	userfetch"
58		59
59	# Ignore file collisions in /lib/modules since files inside this directory	60	# Ignore file collisions in /lib/modules since files inside this directory
60	# are never unmerged, and therefore collisions must be ignored in order for	61	# are never unmerged, and therefore collisions must be ignored in order for

Lines 332-337 validation mechanism to work correctly. Link Here

(-)a/portage/man/make.conf.5 (+3 lines)
332	Fetch everything in \fBSRC_URI\fR regardless of \fBUSE\fR settings,	332	Fetch everything in \fBSRC_URI\fR regardless of \fBUSE\fR settings,
333	except do not fetch anything when \fImirror\fR is in \fBRESTRICT\fR.	333	except do not fetch anything when \fImirror\fR is in \fBRESTRICT\fR.
334	.TP	334	.TP
		335	.B misspell-suggestions
		336	Suggests valids packages name when the given one doesn't exist.
		337	.TP
335	.B multilib\-strict	338	.B multilib\-strict
336	Many Makefiles assume that their libraries should go to /usr/lib, or	339	Many Makefiles assume that their libraries should go to /usr/lib, or
337	$(prefix)/lib. This assumption can cause a serious mess if /usr/lib	340	$(prefix)/lib. This assumption can cause a serious mess if /usr/lib

Lines 2741-2747 class depgraph(object): Link Here

(-)a/portage/pym/_emerge/depgraph.py (-1 / +2 lines)
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 "misspell-suggestions" in pkgsettings.features 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":

Lines 91-100 SUPPORTED_FEATURES = frozenset([ Link Here

(-)a/portage/pym/portage/const.py (-4 / +4 lines)
91	"digest", "distcc", "distlocks", "fakeroot",	91	"digest", "distcc", "distlocks", "fakeroot",
92	"fail-clean", "fixpackages", "force-mirror", "getbinpkg",	92	"fail-clean", "fixpackages", "force-mirror", "getbinpkg",
93	"installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",	93	"installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
94	"metadata-transfer", "mirror", "multilib-strict", "news",	94	"metadata-transfer", "mirror", "misspell-suggestion",
95	"noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip",	95	"multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo",
96	"notitles", "parallel-fetch", "parse-eapi-ebuild-head",	96	"noman", "nostrip", "notitles", "parallel-fetch",
97	"prelink-checksums", "preserve-libs",	97	"parse-eapi-ebuild-head", "prelink-checksums", "preserve-libs",
98	"protect-owned", "python-trace", "sandbox",	98	"protect-owned", "python-trace", "sandbox",
99	"selinux", "sesandbox", "severe", "sfperms",	99	"selinux", "sesandbox", "severe", "sfperms",
100	"sign", "skiprocheck", "split-elog", "split-log", "splitdebug",	100	"sign", "skiprocheck", "split-elog", "split-log", "splitdebug",

Return to bug 363137