[Erp5-report] r42954 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Feb  2 20:01:27 2011
New Revision: 42954

URL: http://svn.erp5.org?rev=42954&view=rev
Log:
build mysql-python against mariadb instead of mysql-tritonn-5.0, that can still communicate to mysql-5.0 servers.

Modified:
    erp5/trunk/buildout/software-profiles/mysql-python.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/mysql-python.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-python.cfg?rev=42954&r1=42953&r2=42954&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mysql-python.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-python.cfg [utf8] Wed Feb  2 20:01:27 2011
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-  mysql-tritonn-5.0.cfg
+  mariadb.cfg
   openssl.cfg
   zlib.cfg
 
@@ -8,13 +8,13 @@ parts =
   mysql-python
 
 [mysql-python-env]
-PATH =${mysql-tritonn-5.0:location}/bin:%(PATH)s
+PATH =${mariadb:location}/bin:%(PATH)s
 
 [mysql-python]
 recipe = zc.recipe.egg:custom
 egg = MySQL-python
 environment = mysql-python-env
 rpath =
-  ${mysql-tritonn-5.0:location}/lib/mysql/
+  ${mariadb:location}/lib/mysql/
   ${zlib:location}/lib/
   ${openssl:location}/lib/

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=42954&r1=42953&r2=42954&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Feb  2 20:01:27 2011
@@ -758,13 +758,13 @@ class AssertPythonMysql(AssertSoftwareMi
       if d.startswith('MySQL_python'):
         path = os.path.join('develop-eggs', d, '_mysql.so')
         elf_dict = readElfAsDict(path)
-        self.assertEqual(sorted(['libc', 'libcrypt', 'libcrypto', 'libm',
-      'libmysqlclient_r', 'libnsl', 'libpthread', 'libssl', 'libz']),
+        self.assertEqual(sorted(['libc', 'libcrypt', 'libm',
+      'libmysqlclient_r', 'libnsl', 'libpthread', 'librt', 'libz']),
           elf_dict['library_list'])
         soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
         expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
             software in ['zlib', 'openssl']]
-        expected_rpath_list.append(os.path.join(os.path.abspath(os.curdir), 'parts', 'mysql-tritonn-5.0', 'lib', 'mysql'))
+        expected_rpath_list.append(os.path.join(os.path.abspath(os.curdir), 'parts', 'mariadb', 'lib', 'mysql'))
         self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
 class AssertApache(AssertSoftwareMixin):