[Erp5-report] r43573 gabriel - /erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/reci...

[nobody at svn.erp5.org]

Author: gabriel
Date: Tue Feb 22 18:26:47 2011
New Revision: 43573

URL: http://svn.erp5.org?rev=43573&view=rev
Log:
refactor code to keep indentation and added mimetype_registry in conf template

Modified:
    erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py
    erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in

Modified: erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py?rev=43573&r1=43572&r2=43573&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py [utf8] Tue Feb 22 18:26:47 2011
@@ -8,10 +8,15 @@ class Recipe(object):
   def __init__(self, buildout, name, options):
     options['output'] = options['conf-output']
     options['input'] = path.join(path.abspath(path.dirname(__file__)), 
-                                  "cloudooo.conf.in" )
+                                  "cloudooo.conf.in")
+    # When options is parsed by buildout, all spaces are removed. For
+    # mimetype-registry is need spaces for identation.
+    if "mimetype-registry" in options:
+      options["mimetype-registry"] = options["mimetype-registry"].replace("\n",
+                                                                       "\n ")
     self.conf_template = z3c_template.Recipe(buildout, name, options)
     options['input'] = path.join(path.abspath(path.dirname(__file__)), 
-                                  "cloudoooctl.in" )
+                                  "cloudoooctl.in")
     options['output'] = options['ctl-output']
     self.ctl_template = z3c_template.Recipe(buildout, name, options)
 

Modified: erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in?rev=43573&r1=43572&r2=43573&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in [utf8] Tue Feb 22 18:26:47 2011
@@ -38,6 +38,8 @@ openoffice_port = ${openoffice-port}
 env-PATH = ${env-PATH}
 env-LD_LIBRARY_PATH = ${env-LD_LIBRARY_PATH}
 
+mimetype_registry = ${mimetype-registry}
+
 [server:main]
 use = egg:PasteScript#wsgiutils
 host = ${server-hostname}