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

[kobold at users.alioth.debian.org]

Author: kobold
Date: Sun Jun 17 15:21:10 2007
New Revision: 904

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=904
Log:
Preparing the new upload.

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=904&op=diff
==============================================================================
--- zope-common/trunk/debian/changelog (original)
+++ zope-common/trunk/debian/changelog Sun Jun 17 15:21:10 2007
@@ -1,3 +1,9 @@
+zope-common (0.5.35) experimental; urgency=low
+
+  * dzhandle: implemented a new command, remove-zeoinstance.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Sun, 17 Jun 2007 17:20:45 +0200
+
 zope-common (0.5.34) experimental; urgency=low
 
   * dzhandle:

Modified: zope-common/trunk/dzhandle
URL: http://svn.debian.org/wsvn/pkg-zope/zope-common/trunk/dzhandle?rev=904&op=diff
==============================================================================
--- zope-common/trunk/dzhandle (original)
+++ zope-common/trunk/dzhandle Sun Jun 17 15:21:10 2007
@@ -1649,6 +1649,31 @@
 register_action(DZRemoveInstance)
 
 
+class DZRemoveZEOInstance(DZAction):
+    name = 'remove-zeoinstance'
+    help = 'remove a zeo instance (except data files), mark it as removed'
+
+    def check_args(self, global_options):
+        if len(self.args) != 1:
+            self.error('<instance>')
+        try:
+            self.instance = locate_zeoinstance(self.args[0],
+                                            versions=global_options.zversion)
+        except DZError, msg:
+            self.error(msg)
+        return self.errors_occured
+
+    def run(self, global_options):
+        cmd = ["rm", "-rf", 
+               self.instance.home + "/bin",
+               ]
+        rv = subprocess.call(cmd)
+        if rv:
+            sys.exit(rv)
+
+register_action(DZRemoveZEOInstance)
+
+
 class DZPurgeInstance(DZAction):
     name = 'purge-instance'
     help = 'purge files in an instance (including data files)'
@@ -2060,6 +2085,8 @@
         self.home = home
         self.name = os.path.basename(home)
         self.version = version
+        self.is_removed = False
+        self.is_removed |= not os.path.exists(os.path.join(home, 'bin', 'zeoctl'))
 
     def is_running(self):
         cmd = [os.path.join(self.home, 'bin', 'zeoctl'), 'status']
@@ -2079,6 +2106,7 @@
         s = '%(name)-20s %(version)-5s ' % self.__dict__
         if verbose:
             pass
+        if self.is_removed: s += ' removed'
         return s