From 03fb5cbb671cb6699b55d0f4e28c2091b00b7d56 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 19 Sep 2006 13:56:26 +0000
Subject: [PATCH] merged from HEAD

[SVN r35201]
---
 v2/tools/python.jam | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/v2/tools/python.jam b/v2/tools/python.jam
index c279ed34e..5c5b14546 100644
--- a/v2/tools/python.jam
+++ b/v2/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) ;
     }