[Zope-Checkins] CVS: Zope - configure:1.5

[Guido van Rossum]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv14917

Modified Files:
	configure 
Log Message:
Make the TARGET version 2.2.3.  (Should also update README.)
Add 2.3b1, 2.2.2 as acceptable targets.
Strip trailing '+' from version number in Python.


=== Zope/configure 1.4 => 1.5 ===
--- Zope/configure:1.4	Sat Mar 22 12:02:12 2003
+++ Zope/configure	Tue Jun 10 13:26:03 2003
@@ -13,13 +13,13 @@
 
 # Place the optimal target version number for Zope (as returned by sys.version)
 # below
-TARGET="2.2.2"
+TARGET="2.2.3"
 
 # Order a list of "acceptable" python version numbers (as returned by
 # sys.version) below in "best" to "worst" order.  Up to six
 # acceptable python versions are allowed.  Do not include the target
 # version number in this list.
-ACCEPTABLE="2.3 2.3a1 2.3a0"
+ACCEPTABLE="2.3 1.2b1 2.3a1 2.3a0 2.2.2"
 
 # provide the executable names for all the acceptable versions
 # (and the target version) below
@@ -67,7 +67,9 @@
         for EXECUTABLE in $EXENAMES; do
             FULL="$DIR/$EXECUTABLE"
             if [ -x "$FULL" ]; then
-                CMD="import string,sys;print string.split(sys.version)[0]"
+                CMD="import string,sys;a=string.split(sys.version)[0]"
+		# Strip trailing + from version number
+		CMD="$CMD;a=(a[-1]=='+')and(a[:-1])or(a);print a"
                 VERSION=`$FULL -c "$CMD"`
                 echo "  Python version $VERSION found at $FULL"
                 if [ "$VERSION" = "$TARGET" ]; then