From b18cb60cf9460951b49633f628ddce24b2cc558f Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Tue, 19 Sep 2006 13:54:57 +0000 Subject: [PATCH] Fix version syntax checking [SVN r35200] --- src/tools/python.jam | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/tools/python.jam b/src/tools/python.jam index c279ed34e..5c5b14546 100644 --- a/src/tools/python.jam +++ b/src/tools/python.jam @@ -156,9 +156,14 @@ rule init-unix ( version ? : root ? : includes ? : libraries ? : condition * ) # if $(version) { - if ! [ MATCH ^[0-9]+\.[0-9]+$ : $(version) : 0 ] + local v = [ MATCH ^([0-9]+\.[0-9]+)(.*)$ : $(version) : 1 2 ] ; + if ! $(v) || $(v[2]) { ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; + if $(v) + { + version = $(v[1]) ; + } } debug-message looking for python $(version) ; }