r878 - in zope-common/branches/etch: . debian

[bzed-guest at alioth.debian.org]

Author: bzed-guest
Date: 2007-05-16 23:13:40 +0000 (Wed, 16 May 2007)
New Revision: 878

Modified:
   zope-common/branches/etch/debian/changelog
   zope-common/branches/etch/dzhandle
Log:
fixes for etch


Modified: zope-common/branches/etch/debian/changelog
===================================================================
--- zope-common/branches/etch/debian/changelog	2007-05-14 18:26:22 UTC (rev 877)
+++ zope-common/branches/etch/debian/changelog	2007-05-16 23:13:40 UTC (rev 878)
@@ -1,3 +1,14 @@
+zope-common (0.5.31.etch1) UNRELEASED; urgency=low
+
+  * fixing a bug which made dzhandle choke on manually installed,
+    non-Debian products (Closes: #422875)
+  * the bin directory of a new Zope instance should be owned by
+    root:root as the scripts inside the directory are executed by
+    root while starting/stopping the Zope instance. Thanks to
+    Bastian Blank for reporting. (Closes: #388072)
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Thu, 17 May 2007 01:12:29 +0200
+
 zope-common (0.5.31) unstable; urgency=low
 
   * debian/control: Depend on the unversioned python package.

Modified: zope-common/branches/etch/dzhandle
===================================================================
--- zope-common/branches/etch/dzhandle	2007-05-14 18:26:22 UTC (rev 877)
+++ zope-common/branches/etch/dzhandle	2007-05-16 23:13:40 UTC (rev 878)
@@ -1134,9 +1134,11 @@
     def run(self, global_options):
         for addon, iaddon in self.addons:
             try:
+                if not addon:
+                    addon = iaddon
                 self.instance.remove_addon(addon, global_options)
                 self.info("removed %s `%s' from instance `%s' (%s)"
-                          % (self.kind, addon.directory, self.instance.name, self.instance.version))
+                      % (self.kind, addon.name, self.instance.name, self.instance.version))
             except DZError, msg:
                 self.error(msg, go_on=True)
 
@@ -1504,6 +1506,12 @@
         if rv:
             subprocess.call(['/bin/rm', '-fr', self.instance_home])
             sys.exit(rv)
+        
+        #giving the bin dir to root:root (#388072)
+        for chown_file in os.listdir(os.path.join(self.instance_home, 'bin')):
+            os.chown(os.path.join(self.instance_home, 'bin', chown_file), 0, 0)
+        os.chown(os.path.join(self.instance_home, 'bin'), 0, 0)
+        
         instance = ZopeInstance(self.instance_home, self.zversion, read_dzfile=False)
         instance.set_addon_mode(self.options.amode)
         instance.set_addon_technique(self.options.atechnique)