[Erp5-report] r32406 nicolas.dumazet - in /erp5/trunk/buildout/mysql-tritonn-5.0: ./ src/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Wed Feb 10 11:32:04 2010
New Revision: 32406

URL: http://svn.erp5.org?rev=32406&view=rev
Log:
Make sure that a /var directory is created after installation,
or mysqld wont start.

Added:
    erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_hooks.py
      - copied, changed from r32397, erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py
Removed:
    erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py
Modified:
    erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg

Modified: erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg?rev=32406&r1=32405&r2=32406&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg [utf8] Wed Feb 10 11:32:04 2010
@@ -20,7 +20,8 @@
 [mysql-tritonn-5.0]
 recipe = hexagonit.recipe.cmmi
 url = http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.87.tar.gz
-pre-configure-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_pre_configure.py:hook
+pre-configure-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_hooks.py:pre_configure_hook
+post-make-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_hooks.py:post_make_hook
 configure-options = --with-senna --without-mecab --enable-thread-safe-client
 patch-options = -p1
 patches = ${tritonn-patch:location}/${tritonn-patch:patch}

Copied: erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_hooks.py (from r32397, erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py)
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_hooks.py?p2=erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_hooks.py&p1=erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py&r1=32397&r2=32406&rev=32406&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_hooks.py [utf8] Wed Feb 10 11:32:04 2010
@@ -1,3 +1,4 @@
+import errno
 import os
 
 # the comand below assumes there is only one sub-directory under the
@@ -12,5 +13,12 @@
 touch sql/sql_yacc.yy
 """.strip()
 
-def hook(options, buildout):
+def pre_configure_hook(options, buildout):
     os.system(CMDS % options['compile-directory'])
+
+def post_make_hook(options, buildout):
+    try:
+    	os.mkdir("%s/var" % options['location'])
+    except OSError, e:
+	if e.errno != errno.EEXIST:
+	    raise

Removed: erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py?rev=32405&view=auto
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_pre_configure.py (removed)
@@ -1,16 +1,0 @@
-import os
-
-# the comand below assumes there is only one sub-directory under the
-# 'compile-directory', which is why the cd .../* would work.
-CMDS = """
-cd %s/*
-libtoolize -c -f
-aclocal-1.9
-autoheader
-automake-1.9 -c -a -i
-autoconf
-touch sql/sql_yacc.yy
-""".strip()
-
-def hook(options, buildout):
-    os.system(CMDS % options['compile-directory'])