[Erp5-report] r38748 kazuhiko - in /erp5/trunk/utils/erp5.recipe.sphinxserver: ./ src/erp5/...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Sep 29 14:27:55 2010
New Revision: 38748

URL: http://svn.erp5.org?rev=38748&view=rev
Log:
- Use Template.safe_substitute to support $start etc. in the sphinx.conf template.
- Install more scripts.
  [Kazuhiko Shiozaki]

Modified:
    erp5/trunk/utils/erp5.recipe.sphinxserver/CHANGES.txt
    erp5/trunk/utils/erp5.recipe.sphinxserver/src/erp5/recipe/sphinxserver/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.sphinxserver/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.sphinxserver/CHANGES.txt?rev=38748&r1=38747&r2=38748&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.sphinxserver/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.sphinxserver/CHANGES.txt [utf8] Wed Sep 29 14:27:55 2010
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.0.2 (2010-09-29)
+------------------
+
+- Use Template.safe_substitute to support $start etc. in the sphinx.conf template.
+- Install more scripts.
+  [Kazuhiko Shiozaki]
+
 1.0.1 (2010-08-20)
 ------------------
 

Modified: erp5/trunk/utils/erp5.recipe.sphinxserver/src/erp5/recipe/sphinxserver/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.sphinxserver/src/erp5/recipe/sphinxserver/__init__.py?rev=38748&r1=38747&r2=38748&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.sphinxserver/src/erp5/recipe/sphinxserver/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.sphinxserver/src/erp5/recipe/sphinxserver/__init__.py [utf8] Wed Sep 29 14:27:55 2010
@@ -65,7 +65,7 @@ class Recipe(object):
           'sphinx.conf.in').read()
 
     file(self.options['sphinx_conf_file'], 'w').write(
-      WithMinusTemplate(template_input_data).substitute(
+      WithMinusTemplate(template_input_data).safe_substitute(
         self.options.copy()))
 
   def install(self):
@@ -77,7 +77,11 @@ class Recipe(object):
     log_directory = options.get('sphinx_log_directory')
     if not os.path.exists(log_directory):
       os.mkdir(log_directory)
+    self.install_script('indexer')
+    self.install_script('indextool')
+    self.install_script('search')
     self.install_script('searchd')
+    self.install_script('spelldump')
     return []
 
   update = install