[Zope-Checkins] CVS: Zope/lib/python/Controller - Main.py:1.1.2.9

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Controller
In directory cvs.zope.org:/tmp/cvs-serv3495/lib/python/Controller

Modified Files:
      Tag: chrism-install-branch
	Main.py 
Log Message:
Minor buglet fix for python-check in Main.py and a new buildrequires statement in Zope.spec.in.


=== Zope/lib/python/Controller/Main.py 1.1.2.8 => 1.1.2.9 ===
--- Zope/lib/python/Controller/Main.py:1.1.2.8	Sat Oct 12 16:28:35 2002
+++ Zope/lib/python/Controller/Main.py	Sat Oct 12 18:37:43 2002
@@ -541,16 +541,18 @@
     # check for Python version
     # too chicken to preclude 2.1 yet
     python_version = sys.version.split()[0]
+    optimum_version = '2.2.2'
     if python_version < '2.1':
         raise 'Invalid python version', python_version
     if python_version[:3] == '2.1':
-        err('You are running Python version %s.  This may work, but it'
-            'may not.  Consider upgrading to Python 2.2.2')
+        err = ('You are running Python version %s.  This may work, but it '
+               'may not.  Consider upgrading to Python %s' %
+               (python_version, optimum_version))
         warnings.warn(err)
     if python_version[:3] == '2.2':
         if python_version[4:5] < '2':
             err = ('You are running Python version %s.  This Python version '
                    'has known bugs that may cause Zope to run improperly. '
-                   'Consider upgrading to a Python in the 2.2 series '
-                   'with at least version number 2.2.2.' % python_version)
+                   'Consider upgrading to Python %s' %
+                   (python_version, optimum_version))
             warnings.warn(err)