diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-10-30 14:29:54 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-10-30 14:29:54 +0000 |
| commit | 7f824e06af5a83d97a60b829cf3941baf542b504 (patch) | |
| tree | b999a2ebc125d9b8a92b519d12f78881e7abea11 /eclass | |
| parent | Add regression tests for bug #388961. (diff) | |
| download | gentoo-2-7f824e06af5a83d97a60b829cf3941baf542b504.tar.gz gentoo-2-7f824e06af5a83d97a60b829cf3941baf542b504.tar.bz2 gentoo-2-7f824e06af5a83d97a60b829cf3941baf542b504.zip | |
Fix broken number matching regexp in scons_clean_makeopts().
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=388961
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/scons-utils.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index a87b6e66cad3..54884c03e3a4 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.6 2011/08/29 01:28:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.7 2011/10/30 14:29:54 mgorny Exp $ # @ECLASS: scons-utils.eclass # @MAINTAINER: @@ -129,7 +129,7 @@ scons_clean_makeopts() { ;; # need to take a look at the next arg and guess --jobs) - if [[ ${#} -gt 1 && ${2} =~ [0-9]+ ]]; then + if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then new_makeopts="${new_makeopts+${new_makeopts} }${1} ${2}" shift else @@ -153,7 +153,7 @@ scons_clean_makeopts() { ;; # -j needs to come last j) - if [[ ${#} -gt 1 && ${2} =~ [0-9]+ ]]; then + if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then new_optstr="${new_optstr}j ${2}" shift else |