From 6280b10e19fc6508992610d7299b6a41f18c6cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Tue, 18 Oct 2011 09:56:50 +0200
Subject: [PATCH] Follow substituteTemplate API.

It expects just one dict.
---
 slapos/recipe/generic_zope/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/slapos/recipe/generic_zope/__init__.py b/slapos/recipe/generic_zope/__init__.py
index 4514c5199..185858741 100644
--- a/slapos/recipe/generic_zope/__init__.py
+++ b/slapos/recipe/generic_zope/__init__.py
@@ -121,11 +121,12 @@ class Recipe(GenericBaseRecipe):
       'instance-products'])
     zope_config['products'] = '\n'.join(prefixed_products)
     zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
+    zope_config.update(dump_url=self.options['deadlock-path'],
+      secret=self.options['deadlock-password'])
 
     zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
     zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
-      zope_config, dump_url=self.options['deadlock-path'],
-      secret=self.options['deadlock-password'])
+      zope_config)
 
     zope_conf_path = self.createFile(self.options['configuration-file'], zope_conf_content)
     path_list.append(zope_conf_path)
-- 
2.30.9