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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Aug 20 07:56:02 2010
New Revision: 37913

URL: http://svn.erp5.org?rev=37913&view=rev
Log:
rename several options.

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

Modified: erp5/trunk/utils/erp5.recipe.sphinxserver/README.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.sphinxserver/README.txt?rev=37913&r1=37912&r2=37913&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.sphinxserver/README.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.sphinxserver/README.txt [utf8] Fri Aug 20 07:56:02 2010
@@ -13,8 +13,8 @@ You can use it with a part like this::
   [default-server]
   recipe = erp5.recipe.sphinxserver
   sphinx_software_bin = /usr/bin
-  sphinx_bin_folder = ${buildout:bin-directory}
-  sphinx_data_dir = ${buildout:directory}/var/sphinx
+  sphinx_bin_directory = ${buildout:bin-directory}
+  sphinx_data_directory = ${buildout:directory}/var/sphinx
   sphinx_conf_file = ${buildout:etc-directory}/sphinx.conf
 
 Options
@@ -25,11 +25,11 @@ sphinx_software_bin
    Where the Orginal Software Binaries are installed, like /usr/bin when they
    are provided by Linux Packages.
 
-sphinx_bin_folder
+sphinx_bin_directory
 
    Where the Executable Wrapper scripts like searched will be created.
 
-sphinx_data_dir
+sphinx_data_directory
 
    Where the Sphinx data will be kept.
 

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=37913&r1=37912&r2=37913&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] Fri Aug 20 07:56:02 2010
@@ -36,7 +36,7 @@ class Recipe(object):
         buildout['buildout']['parts-directory'],
         self.name)
 
-    options.setdefault('sphinx_bin_folder',
+    options.setdefault('sphinx_bin_directory',
                        buildout['buildout']['bin-directory'])
 
 
@@ -49,7 +49,7 @@ class Recipe(object):
     requirements, ws = self.egg.working_set(['erp5.recipe.sphinxserver'])
     scripts = zc.buildout.easy_install.scripts(
         [(script_name,'erp5.recipe.sphinxserver.ctl', 'main')],
-        ws, options['executable'], options.get("sphinx_bin_folder"),
+        ws, options['executable'], options.get("sphinx_bin_directory"),
         arguments = ("\n        ['%s/%s' ,"
                      "\n        '-c', '%s'] "
                      "\n        + sys.argv[1:]" % (sphinx_software_bin,
@@ -71,12 +71,12 @@ class Recipe(object):
   def install(self):
     options = self.options
     self.build_configuration_file()
-    data_dir = options.get('sphinx_data_dir')
-    if not os.path.exists(data_dir):
-      os.mkdir(data_dir)
-    log_dir = options.get('sphinx_log_dir')
-    if not os.path.exists(log_dir):
-      os.mkdir(log_dir)
+    data_directory = options.get('sphinx_data_directory')
+    if not os.path.exists(data_directory):
+      os.mkdir(data_directory)
+    log_directory = options.get('sphinx_log_directory')
+    if not os.path.exists(log_directory):
+      os.mkdir(log_directory)
     self.install_script('searchd')
     return []