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

Collapse All | Expand All

(-)/usr/lib/portage/bin/emerge.orig (-2 / +9 lines)
Lines 43-49 Link Here
43
"--skipfirst",
43
"--skipfirst",
44
"--update",       "--upgradeonly",
44
"--update",       "--upgradeonly",
45
"--usepkg",       "--usepkgonly",
45
"--usepkg",       "--usepkgonly",
46
"--verbose",      "--version"
46
"--verbose",      "--version",
47
"--masked"
47
]
48
]
48
49
49
shortmapping={
50
shortmapping={
Lines 55-61 Link Here
55
"h":"--help",
56
"h":"--help",
56
"i":"--inject",
57
"i":"--inject",
57
"k":"--usepkg",    "K":"--usepkgonly",
58
"k":"--usepkg",    "K":"--usepkgonly",
58
"l":"--changelog",
59
"l":"--changelog", "m":"--masked",
59
"n":"--noreplace",
60
"n":"--noreplace",
60
"o":"--onlydeps",  "O":"--nodeps",
61
"o":"--onlydeps",  "O":"--nodeps",
61
"p":"--pretend",   "P":"--prune",
62
"p":"--pretend",   "P":"--prune",
Lines 175-180 Link Here
175
if ("--noconfmem" in myopts):
176
if ("--noconfmem" in myopts):
176
	portage.settings["NOCONFMEM"]="1"
177
	portage.settings["NOCONFMEM"]="1"
177
178
179
# Add the unstable arch
180
if ("--masked" in myopts):
181
        portage.groups.append("~"+portage.settings["ACCEPT_KEYWORDS"])
182
        portage.settings["ACCEPT_KEYWORDS"]= portage.settings["ACCEPT_KEYWORDS"] + " ~" +  portage.settings["ACCEPT_KEYWORDS"]
183
178
# Set various debug markers... They should be merged somehow.
184
# Set various debug markers... They should be merged somehow.
179
if ("--debug" in myopts):
185
if ("--debug" in myopts):
180
	portage.settings["PORTAGE_DEBUG"]="1"
186
	portage.settings["PORTAGE_DEBUG"]="1"
Lines 764-769 Link Here
764
							print "\n!!! "+red("all ebuilds that could satisfy ")+green(xinfo)+red(" have been masked.")
770
							print "\n!!! "+red("all ebuilds that could satisfy ")+green(xinfo)+red(" have been masked.")
765
							if myparent:
771
							if myparent:
766
								print     "!!!    "+red(xfrom)
772
								print     "!!!    "+red(xfrom)
773
							print "!!! "+red("Use --masked or -m to install masked packages.")
767
						else:
774
						else:
768
							print "\n!!! "+red("There are no packages available to satisfy: ")+green(xinfo)
775
							print "\n!!! "+red("There are no packages available to satisfy: ")+green(xinfo)
769
							print "!!! Either add a suitable binary package or compile from an ebuild."
776
							print "!!! Either add a suitable binary package or compile from an ebuild."

Return to bug 23861