aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-08-15 12:15:37 -0700
committerZac Medico <zmedico@gentoo.org>2020-08-16 20:48:15 -0700
commit8ad29c19c1a3ac8529c5c78534769d2771964bcb (patch)
tree97f59cdcb67c0f3ed588c217db746936517df0b5
parentemerge: Remove deprecated --changelog option (bug 699256) (diff)
downloadportage-8ad29c19c1a3ac8529c5c78534769d2771964bcb.tar.gz
portage-8ad29c19c1a3ac8529c5c78534769d2771964bcb.tar.bz2
portage-8ad29c19c1a3ac8529c5c78534769d2771964bcb.zip
emerge: Add short -l option for --load-average (bug 699256)
Add a short -l option for --load-average just like make(1) has. Bug: https://bugs.gentoo.org/699256 Reviewed-by: Brian Dolbec <dolsen@gentoo.org> Reviewed-by: Matt Turner <mattst88@gentoo.org> Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--lib/_emerge/main.py2
-rw-r--r--man/emerge.12
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index 5aac451fe..975738762 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -171,6 +171,7 @@ def insert_optional_args(args):
short_arg_opts = {
'D' : valid_integers,
'j' : valid_integers,
+ 'l' : valid_floats,
}
# Don't make things like "-kn" expand to "-k n"
@@ -542,6 +543,7 @@ def parse_opts(tmpcmdline, silent=False):
},
"--load-average": {
+ "shortopt" : "-l",
"help" :"Specifies that no new builds should be started " + \
"if there are other builds running and the load average " + \
diff --git a/man/emerge.1 b/man/emerge.1
index 9f77d1fa2..fe7d05a21 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -688,7 +688,7 @@ dependencies are recalculated for remaining packages and any with
unsatisfied dependencies are automatically dropped. Also see
the related \fB\-\-skipfirst\fR option.
.TP
-.BR "\-\-load\-average [LOAD]"
+.BR \-l\ [LOAD] ", " \-\-load\-average[=LOAD]
Specifies that no new builds should be started if there are other builds
running and the load average is at least LOAD (a floating-point number).
With no argument, removes a previous load limit.