diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py index 292a20668f2eefc9411294096c506844f3f7275d..def0c0edd3d7c7a275651bbeb0185e1cdda439f8 100644 --- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py +++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py @@ -613,8 +613,7 @@ class Recipe(BaseSlapRecipe): return dict(host=ip, port=port) def installZope(self, ip, port, name, zodb_configuration_string, - with_timerservice=False, tidstorage_config=None, thread_amount=1, - with_deadlockdebugger=True): + with_timerservice=False, tidstorage_config=None, thread_amount=1): # Create zope configuration file zope_config = dict( products=self.options['products'], @@ -623,12 +622,6 @@ class Recipe(BaseSlapRecipe): # configure default Zope2 zcml open(os.path.join(self.erp5_directory, 'etc', 'site.zcml'), 'w').write( pkg_resources.resource_string('Zope2', 'utilities/skel/etc/site.zcml')) - if with_deadlockdebugger: - open(os.path.join(self.erp5_directory, 'etc', 'package-includes', - 'deadlockdebugger-configure.zcml'), 'w').write('''<configure> - <include package="zope.applicationcontrol"/> - <include package="z3c.deadlockdebugger"/> -</configure>''') zope_config['zodb_configuration_string'] = zodb_configuration_string zope_config['instance'] = self.erp5_directory zope_config['event_log'] = os.path.join(self.log_directory, diff --git a/slapos/software.cfg b/slapos/software.cfg index 30741a84a72601fcb051ef6108e4aade2860a4a2..f815b5c45421d16b620ad78bdefdec3432efebef 100644 --- a/slapos/software.cfg +++ b/slapos/software.cfg @@ -331,9 +331,6 @@ eggs = # Products.PortalTransforms # Dependency for our fork of PortalTransforms StructuredText -# replacement of DeadlockDebugger - zope.applicationcontrol - z3c.deadlockdebugger # parameterizing the version of the generated python interpreter name by the # python section version causes dependency between this egg section and the