Commit 13a53d25 authored by Jim Fulton's avatar Jim Fulton

Made the guts of version_text a stand-alond function so that ZServer

can use it and not import Main.
parent 394468f1
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
# #
############################################################################## ##############################################################################
__doc__="""System management components""" __doc__="""System management components"""
__version__='$Revision: 1.43 $'[11:-2] __version__='$Revision: 1.44 $'[11:-2]
import sys,os,time,string,Globals, Acquisition import sys,os,time,string,Globals, Acquisition
...@@ -114,6 +114,12 @@ class DatabaseManager(Fake, SimpleItem.Item, Acquisition.Implicit): ...@@ -114,6 +114,12 @@ class DatabaseManager(Fake, SimpleItem.Item, Acquisition.Implicit):
) )
def version_txt(self):
try: return open(os.path.join(SOFTWARE_HOME,'version.txt')).read()
except: return '(unreleased version)'
return self._v_version_txt
class ApplicationManager(Folder,CacheManager): class ApplicationManager(Folder,CacheManager):
"""System management""" """System management"""
...@@ -126,9 +132,7 @@ class ApplicationManager(Folder,CacheManager): ...@@ -126,9 +132,7 @@ class ApplicationManager(Folder,CacheManager):
def version_txt(self): def version_txt(self):
if not hasattr(self, '_v_version_txt'): if not hasattr(self, '_v_version_txt'):
try: self._v_version_txt=open( self._v_version_txt=version_txt()
os.path.join(SOFTWARE_HOME,'version.txt')).read()
except: self._v_version_txt='(unreleased version)'
return self._v_version_txt return self._v_version_txt
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment