Attachment #186932 for bug #222895

View | Details | Raw Unified | Return to bug 222895
Collapse All | Expand All




		print "              not trigger reinstallation when flags that the user has not"
		print "              enabled are added or removed."
		print
		print "       "+green("--root-deps[=rdeps]")
		desc = "If no argument is given then build-time dependencies are installed to " + \
			"ROOT instead of /. If the rdeps argument is given then discard " + \
			"all build-time dependencies of packages for ROOT. This option is " + \
			"only meaningful when used together with ROOT and it should not " + \
			"be enabled under normal circumstances. For currently supported " + \
			"EAPI values, the build-time dependencies are specified in the " + \
			"DEPEND variable. However, behavior may change for new " + \
			"EAPIs when related extensions are added in the future."
		for line in wrap(desc, desc_width):
			print desc_indent + line
		print
		print "       "+green("--skipfirst")
		desc = "This option is only valid when " + \
			"used with --resume.  It removes the " + \

Lines 5252-5259 Link Here

(-)pym/_emerge/__init__.py (-2 / +38 lines)
5252	if removal_action and self.myopts.get("--with-bdeps", "y") == "n":	5252	if removal_action and self.myopts.get("--with-bdeps", "y") == "n":
5253	edepend["DEPEND"] = ""	5253	edepend["DEPEND"] = ""
5254		5254
		5255	bdeps_root = "/"
		5256	if self.target_root != "/":
		5257	root_deps = self.myopts.get("--root-deps")
		5258	if root_deps is not None:
		5259	if root_deps is True:
		5260	bdeps_root = myroot
		5261	elif root_deps == "rdeps":
		5262	bdeps_root = "/"
		5263	edepend["DEPEND"] = ""
		5264
5255	deps = (	5265	deps = (
5256	("/", edepend["DEPEND"],	5266	(bdeps_root, edepend["DEPEND"],
5257	self._priority(buildtime=(not bdeps_optional),	5267	self._priority(buildtime=(not bdeps_optional),
5258	optional=bdeps_optional)),	5268	optional=bdeps_optional)),
5259	(myroot, edepend["RDEPEND"], self._priority(runtime=True)),	5269	(myroot, edepend["RDEPEND"], self._priority(runtime=True)),
Lines 14333-14343 Link Here
14333		14343
14334	new_args = []	14344	new_args = []
14335	jobs_opts = ("-j", "--jobs")	14345	jobs_opts = ("-j", "--jobs")
		14346	root_deps_opt = '--root-deps'
		14347	root_deps_choices = ('True', 'rdeps')
14336	arg_stack = args[:]	14348	arg_stack = args[:]
14337	arg_stack.reverse()	14349	arg_stack.reverse()
14338	while arg_stack:	14350	while arg_stack:
14339	arg = arg_stack.pop()	14351	arg = arg_stack.pop()
14340		14352
		14353	if arg == root_deps_opt:
		14354	new_args.append(arg)
		14355	if arg_stack and arg_stack[-1] in root_deps_choices:
		14356	new_args.append(arg_stack.pop())
		14357	else:
		14358	# insert default argument
		14359	new_args.append('True')
		14360	continue
		14361
14341	short_job_opt = bool("j" in arg and arg[:1] == "-" and arg[:2] != "--")	14362	short_job_opt = bool("j" in arg and arg[:1] == "-" and arg[:2] != "--")
14342	if not (short_job_opt or arg in jobs_opts):	14363	if not (short_job_opt or arg in jobs_opts):
14343	new_args.append(arg)	14364	new_args.append(arg)
Lines 14425-14431 Link Here
14425	"help":"specify conditions to trigger package reinstallation",	14446	"help":"specify conditions to trigger package reinstallation",
14426	"type":"choice",	14447	"type":"choice",
14427	"choices":["changed-use"]	14448	"choices":["changed-use"]
14428	}	14449	},
		14450	"--root": {
		14451	"help" : "specify the target root filesystem for merging packages",
		14452	"action" : "store"
		14453	},
		14454
		14455	"--root-deps": {
		14456	"help" : "modify interpretation of depedencies",
		14457	"type" : "choice",
		14458	"choices" :("True", "rdeps")
		14459	},
14429	}	14460	}
14430		14461
14431	from optparse import OptionParser	14462	from optparse import OptionParser
Lines 14454-14459 Link Here
14454		14485
14455	myoptions, myargs = parser.parse_args(args=tmpcmdline)	14486	myoptions, myargs = parser.parse_args(args=tmpcmdline)
14456		14487
		14488	if myoptions.root_deps == "True":
		14489	myoptions.root_deps = True
		14490
14457	if myoptions.jobs:	14491	if myoptions.jobs:
14458	jobs = None	14492	jobs = None
14459	if myoptions.jobs == "True":	14493	if myoptions.jobs == "True":
Lines 14818-14823 Link Here
14818	os.environ["PORTAGE_DEBUG"] = "1"	14852	os.environ["PORTAGE_DEBUG"] = "1"
14819	if "--config-root" in myopts:	14853	if "--config-root" in myopts:
14820	os.environ["PORTAGE_CONFIGROOT"] = myopts["--config-root"]	14854	os.environ["PORTAGE_CONFIGROOT"] = myopts["--config-root"]
		14855	if "--root" in myopts:
		14856	os.environ["ROOT"] = myopts["--root"]
14821		14857
14822	# Portage needs to ensure a sane umask for the files it creates.	14858	# Portage needs to ensure a sane umask for the files it creates.
14823	os.umask(022)	14859	os.umask(022)




not trigger reinstallation when flags that the user has not
enabled are added or removed.
.TP
.BR \-\-root=DIR
Set the \fBROOT\fR environment variable.
.TP
.BR "\-\-root\-deps[=rdeps]"
If no argument is given then build\-time dependencies are installed to
\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard
all build\-time dependencies of packages for \fBROOT\fR. This option is
only meaningful when used together with \fBROOT\fR and it should not
be enabled under normal circumstances. For currently supported
\fBEAPI\fR values, the build-time dependencies are specified in the
\fBDEPEND\fR variable. However, behavior may change for new
\fBEAPI\fRs when related extensions are added in the future.
.TP
.BR "\-\-skipfirst"
This option is only valid when used with \fB\-\-resume\fR.  It removes the 
first package in the resume list. Dependencies are recalculated for

.TP
\fBROOT\fR = \fI[path]\fR
Use \fBROOT\fR to specify the target root filesystem to be used for
merging packages or ebuilds. This variable can be set via the \fB\-\-root\fR
option or in \fBmake.conf\fR(5) (the command line overrides other settings).
.br
Defaults to /.
.TP

Return to bug 222895

Lines 407-412 Link Here

(-)pym/_emerge/help.py (+12 lines)
407	print " not trigger reinstallation when flags that the user has not"	407	print " not trigger reinstallation when flags that the user has not"
408	print " enabled are added or removed."	408	print " enabled are added or removed."
409	print	409	print
		410	print " "+green("--root-deps[=rdeps]")
		411	desc = "If no argument is given then build-time dependencies are installed to " + \
		412	"ROOT instead of /. If the rdeps argument is given then discard " + \
		413	"all build-time dependencies of packages for ROOT. This option is " + \
		414	"only meaningful when used together with ROOT and it should not " + \
		415	"be enabled under normal circumstances. For currently supported " + \
		416	"EAPI values, the build-time dependencies are specified in the " + \
		417	"DEPEND variable. However, behavior may change for new " + \
		418	"EAPIs when related extensions are added in the future."
		419	for line in wrap(desc, desc_width):
		420	print desc_indent + line
		421	print
410	print " "+green("--skipfirst")	422	print " "+green("--skipfirst")
411	desc = "This option is only valid when " + \	423	desc = "This option is only valid when " + \
412	"used with --resume. It removes the " + \	424	"used with --resume. It removes the " + \

Lines 417-422 Link Here

(-)man/emerge.1 (-1 / +15 lines)
417	not trigger reinstallation when flags that the user has not	417	not trigger reinstallation when flags that the user has not
418	enabled are added or removed.	418	enabled are added or removed.
419	.TP	419	.TP
		420	.BR \-\-root=DIR
		421	Set the \fBROOT\fR environment variable.
		422	.TP
		423	.BR "\-\-root\-deps[=rdeps]"
		424	If no argument is given then build\-time dependencies are installed to
		425	\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard
		426	all build\-time dependencies of packages for \fBROOT\fR. This option is
		427	only meaningful when used together with \fBROOT\fR and it should not
		428	be enabled under normal circumstances. For currently supported
		429	\fBEAPI\fR values, the build-time dependencies are specified in the
		430	\fBDEPEND\fR variable. However, behavior may change for new
		431	\fBEAPI\fRs when related extensions are added in the future.
		432	.TP
420	.BR "\-\-skipfirst"	433	.BR "\-\-skipfirst"
421	This option is only valid when used with \fB\-\-resume\fR. It removes the	434	This option is only valid when used with \fB\-\-resume\fR. It removes the
422	first package in the resume list. Dependencies are recalculated for	435	first package in the resume list. Dependencies are recalculated for
Lines 471-477 Link Here
471	.TP	484	.TP
472	\fBROOT\fR = \fI[path]\fR	485	\fBROOT\fR = \fI[path]\fR
473	Use \fBROOT\fR to specify the target root filesystem to be used for	486	Use \fBROOT\fR to specify the target root filesystem to be used for
474	merging packages or ebuilds. This variable can be set in \fBmake.conf\fR(5).	487	merging packages or ebuilds. This variable can be set via the \fB\-\-root\fR
		488	option or in \fBmake.conf\fR(5) (the command line overrides other settings).
475	.br	489	.br
476	Defaults to /.	490	Defaults to /.
477	.TP	491	.TP