| Message ID | 20210122181854.23105-8-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | testing/next (docker, binfmt, gdb version) | expand |
On 22/01/2021 19.18, Alex Bennée wrote: > When checking GDB versions we have to tolerate all sorts of random > distro extensions to the version string. While we already attempt to > do some of that before we call version_ge is makes sense to try and > regularise the first input by stripping extraneous -'s. While we at it > convert the old-style shell quoting into a cleaner form t shut up my > editors linter lest it confuse me by underlining the whole line. > > Suggested-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > configure | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 6f6a319c2f..dd99939b34 100755 > --- a/configure > +++ b/configure > @@ -198,8 +198,8 @@ has() { > } > > version_ge () { > - local_ver1=`echo $1 | tr . ' '` > - local_ver2=`echo $2 | tr . ' '` > + local_ver1=$(expr "$1" : '\([0-9.]*\)' | tr . ' ') > + local_ver2=$(echo "$2" | tr . ' ') > while true; do > set x $local_ver1 > local_first=${2-0} > This silences the warnings that I've recently seen when running configure. Tested-by: Thomas Huth <thuth@redhat.com>
diff --git a/configure b/configure index 6f6a319c2f..dd99939b34 100755 --- a/configure +++ b/configure @@ -198,8 +198,8 @@ has() { } version_ge () { - local_ver1=`echo $1 | tr . ' '` - local_ver2=`echo $2 | tr . ' '` + local_ver1=$(expr "$1" : '\([0-9.]*\)' | tr . ' ') + local_ver2=$(echo "$2" | tr . ' ') while true; do set x $local_ver1 local_first=${2-0}
When checking GDB versions we have to tolerate all sorts of random distro extensions to the version string. While we already attempt to do some of that before we call version_ge is makes sense to try and regularise the first input by stripping extraneous -'s. While we at it convert the old-style shell quoting into a cleaner form t shut up my editors linter lest it confuse me by underlining the whole line. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)