[gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass

[Michal Gorny (mgorny)]

mgorny      11/10/30 14:29:54

  Modified:             scons-utils.eclass
  Log:
  Fix broken number matching regexp in scons_clean_makeopts().
  
  Fixes: https://bugs.gentoo.org/show_bug.cgi?id=388961

Revision  Changes    Path
1.7                  eclass/scons-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.6&r2=1.7

Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scons-utils.eclass	29 Aug 2011 01:28:10 -0000	1.6
+++ scons-utils.eclass	30 Oct 2011 14:29:54 -0000	1.7
@@ -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 @@
 				;;
 			# 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 @@
 							;;
 						# -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