r913 - in /zope-common/trunk: debian/changelog dzhandle

[kobold at users.alioth.debian.org]

Author: kobold
Date: Thu Jun 21 18:49:59 2007
New Revision: 913

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=913
Log:
Recognize ZEO instances.

Modified:
    zope-common/trunk/debian/changelog
    zope-common/trunk/dzhandle

Modified: zope-common/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/zope-common/trunk/debian/changelog?rev=913&op=diff
==============================================================================
--- zope-common/trunk/debian/changelog (original)
+++ zope-common/trunk/debian/changelog Thu Jun 21 18:49:59 2007
@@ -1,8 +1,9 @@
 zope-common (0.5.36) unstable; urgency=low
 
   * A rebuild is enough to remove a dangling link. (Closes: #415826)
-
- -- Fabio Tranchitella <kobold at debian.org>  Thu, 21 Jun 2007 19:02:45 +0200
+  * dzhandle: recognize zope instances with ZEO as root database.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu, 21 Jun 2007 20:48:16 +0200
 
 zope-common (0.5.35) experimental; urgency=low
 

Modified: zope-common/trunk/dzhandle
URL: http://svn.debian.org/wsvn/pkg-zope/zope-common/trunk/dzhandle?rev=913&op=diff
==============================================================================
--- zope-common/trunk/dzhandle (original)
+++ zope-common/trunk/dzhandle Thu Jun 21 18:49:59 2007
@@ -1835,8 +1835,15 @@
         self.excluded_addons = []
         self.new_layout = os.path.exists(os.path.join(home, 'bin', 'runzope'))
         self.is_purged = False
-        self.is_purged |= not os.path.exists(os.path.join(home, 'var', 'Data.fs'))
-        self.is_purged |= not os.path.exists(os.path.join(home, 'var', 'Data.fs.index'))
+        self.zeo = False
+        re_zeo = re.compile('[^#]+<zeoclient>').match
+        zope_conf = os.path.join(home, 'etc', 'zope.conf')
+        if os.path.exists(zope_conf) and \
+           filter(lambda x: re_zeo(x) is not None, open(zope_conf).readlines()):
+            self.zeo = True
+        else:
+            self.is_purged |= not os.path.exists(os.path.join(home, 'var', 'Data.fs'))
+            self.is_purged |= not os.path.exists(os.path.join(home, 'var', 'Data.fs.index'))
         self.is_removed = False
         self.is_removed |= not os.path.exists(os.path.join(home, 'bin', 'zopectl'))
         if os.path.isfile(os.path.join(home, 'inituser')):
@@ -2070,10 +2077,16 @@
         else:
             addon_technique = self.addon_technique
         s += ' addon-technique=%s' % addon_technique
-        if self.userfile: s += ' userfile=' + self.userfile
-        if not self.new_layout: s += ' layout=(2.5 and before)'
-        if self.is_purged: s += ' purged'
-        elif self.is_removed: s += ' removed'
+        if self.userfile:
+            s += ' userfile=' + self.userfile
+        if not self.new_layout and not self.is_removed:
+            s += ' layout=(2.5 and before)'
+        if self.zeo:
+            s += ' zeo'
+        if self.is_purged:
+            s += ' purged'
+        elif self.is_removed:
+            s += ' removed'
         if verbose:
             pass
         return s