diff options
| -rw-r--r-- | man/emerge.1 | 6 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 8 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 13 |
3 files changed, 27 insertions, 0 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 6ea103ce5..e6aaf7bef 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -469,6 +469,12 @@ be enabled under normal circumstances. For currently supported \fBDEPEND\fR variable. However, behavior may change for new \fBEAPI\fRs when related extensions are added in the future. .TP +.BR "\-\-select"[=n] +Add specified packages to the world set (inverse of +\fB\-\-oneshot\fR). This is useful if you want to +use \fBEMERGE_DEFAULT_OPTS\fR to make +\fB\-\-oneshot\fR behavior default. +.TP .BR "\-\-selective"[=n] This is similar to the \fB\-\-noreplace\fR option, except that it does not take precedence over options such as \fB\-\-newuse\fR. diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index ce5d4107d..3f18b5429 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -499,6 +499,14 @@ def help(myopts, havecolor=1): for line in wrap(desc, desc_width): print(desc_indent + line) print() + print(" " + green("--select") + "[=%s]" % turquoise("n")) + desc = "Add specified packages to the world set (inverse of " + \ + "--oneshot). This is useful if you want to " + \ + "use EMERGE_DEFAULT_OPTS to make " + \ + "--oneshot behavior default." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() print(" " + green("--selective") + "[=%s]" % turquoise("n")) desc = "This is similar to the --noreplace option, except that it " + \ "does not take precedence over options such as --newuse. " + \ diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 4215d80b9..10e605e56 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -311,6 +311,7 @@ def insert_optional_args(args): '--jobs' : valid_integers, '--keep-going' : ('n',), '--root-deps' : ('rdeps',), + '--select' : ('n',), '--selective' : ('n',), '--usepkg' : ('n',), '--usepkgonly' : ('n',), @@ -535,6 +536,13 @@ def parse_opts(tmpcmdline, silent=False): "choices" :("True", "rdeps") }, + "--select": { + "help" : "add specified packages to the world set " + \ + "(inverse of --oneshot)", + "type" : "choice", + "choices" : ("True", "n") + }, + "--selective": { "help" : "similar to the --noreplace but does not take " + \ "precedence over options such as --newuse", @@ -626,6 +634,11 @@ def parse_opts(tmpcmdline, silent=False): if myoptions.root_deps == "True": myoptions.root_deps = True + if myoptions.select == "True": + myoptions.oneshot = False + elif myoptions.select == "n": + myoptions.oneshot = True + if myoptions.selective == "True": myoptions.selective = True |