[Erp5-report] r37122 luke - in /erp5/trunk/utils/erp5.recipe.mysqlserver: ./ src/erp5/recip...

[nobody at svn.erp5.org]

Author: luke
Date: Thu Jul 15 10:22:03 2010
New Revision: 37122

URL: http://svn.erp5.org?rev=37122&view=rev
Log:
 - check for return code of mysql_install_db and raise error in case of issue
 - add --no-defaults to avoid conflict with existing system-wide mysql installation
 - release version 1.1.3

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

Modified: erp5/trunk/utils/erp5.recipe.mysqlserver/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.mysqlserver/CHANGES.txt?rev=37122&r1=37121&r2=37122&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.mysqlserver/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.mysqlserver/CHANGES.txt [utf8] Thu Jul 15 10:22:03 2010
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.1.3 (2010-07-15)
+------------------
+
+- Improve server datadir creation by ignoring defaults and checking return
+  code of invoked binary.
+  [Lukasz Nowak]
+
 1.1.2 (2010-06-09)
 ------------------
 

Modified: erp5/trunk/utils/erp5.recipe.mysqlserver/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.mysqlserver/setup.py?rev=37122&r1=37121&r2=37122&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.mysqlserver/setup.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.mysqlserver/setup.py [utf8] Thu Jul 15 10:22:03 2010
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 name = "erp5.recipe.mysqlserver"
-version = '1.1.2'
+version = '1.1.3'
 
 def read(name):
     return open(name).read()

Modified: erp5/trunk/utils/erp5.recipe.mysqlserver/src/erp5/recipe/mysqlserver/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.mysqlserver/src/erp5/recipe/mysqlserver/__init__.py?rev=37122&r1=37121&r2=37122&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.mysqlserver/src/erp5/recipe/mysqlserver/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.mysqlserver/src/erp5/recipe/mysqlserver/__init__.py [utf8] Thu Jul 15 10:22:03 2010
@@ -96,9 +96,13 @@ class Recipe(object):
     ibdata1 = os.path.join(datadir, 'ibdata1')
     mysql_software_bin = options.get("mysql_software_bin")
     if not os.path.exists(ibdata1):
-      command = '%s/mysql_install_db --datadir=%s' % (mysql_software_bin, datadir)
-      print command
-      subprocess.call(command, shell=True)
+      command = ['%s/mysql_install_db'%mysql_software_bin, '--no-defaults',
+        '--datadir=%s'%datadir]
+      self.logger.info('Creating server datadir with %r' % command)
+      self.logger.error('')
+      if subprocess.call(command) != 0:
+        raise AttributeError('Issue during creating server datadir. Please '
+            'investigate run command output.')
 
     self.install_script('mysql')
     self.install_script("mysqld_safe")