[Zope-Checkins] CVS: Zope/lib/python/App - Product.py:1.59.4.2

[Jens Vagelpohl]

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

Modified Files:
      Tag: Zope-2_6-branch
	Product.py 
Log Message:
- backport improved product version text handling from HEAD



=== Zope/lib/python/App/Product.py 1.59.4.1 => 1.59.4.2 ===
--- Zope/lib/python/App/Product.py:1.59.4.1	Wed May 28 10:50:25 2003
+++ Zope/lib/python/App/Product.py	Mon Jun  9 10:31:31 2003
@@ -488,12 +488,22 @@
 def initializeProduct(productp, name, home, app):
     # Initialize a levered product
     products=app.Control_Panel.Products
+    fver = ''
 
     if hasattr(productp, '__import_error__'): ie=productp.__import_error__
     else: ie=None
+        
+    # Retrieve version number from any suitable version.txt
+    for fname in ('version.txt', 'VERSION.txt', 'VERSION.TXT'):
+        try:
+            fpath = os.path.join(home, fname)
+            fhandle = open(fpath, 'r')
+            fver = fhandle.read().strip()
+            fhandle.close()
+            break
+        except IOError:
+            continue
 
-    try: fver=open(home+'/version.txt').read().strip()
-    except: fver=''
     old=None
     try:
         if ihasattr(products,name):