Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: base-system@g.o
Subject: [gentoo-dev] [PATCH] multiprocessing.eclass: make loadavg regex work for float values
Date: Mon, 11 Sep 2017 03:23:50
Message-Id: 20170911032340.2758-1-floppym@gentoo.org
1 Bug: https://bugs.gentoo.org/630626
2 ---
3 eclass/multiprocessing.eclass | 2 +-
4 1 file changed, 1 insertion(+), 1 deletion(-)
5
6 diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass
7 index 50368e35ea93..029201779957 100644
8 --- a/eclass/multiprocessing.eclass
9 +++ b/eclass/multiprocessing.eclass
10 @@ -120,7 +120,7 @@ makeopts_loadavg() {
11 # This assumes the first .* will be more greedy than the second .*
12 # since POSIX doesn't specify a non-greedy match (i.e. ".*?").
13 local lavg=$(echo " $* " | sed -r -n \
14 - -e 's:.*[[:space:]](-[a-z]*l|--(load-average|max-load)[=[:space:]])[[:space:]]*([0-9]+|[0-9]+\.[0-9]+).*:\3:p' \
15 + -e 's:.*[[:space:]](-[a-z]*l|--(load-average|max-load)[=[:space:]])[[:space:]]*([0-9]+(\.[0-9]+)*).*:\3:p' \
16 -e "s:.*[[:space:]](-[a-z]*l|--(load-average|max-load))[[:space:]].*:${2:-999}:p")
17 # Default to ${inf} since the default is to not use a load limit.
18 echo ${lavg:-${2:-999}}
19 --
20 2.14.1

Replies