build mysql-python against mariadb instead of mysql-tritonn-5.0, that can...

build mysql-python against mariadb instead of mysql-tritonn-5.0, that can still communicate to mysql-5.0 servers.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42954 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/software-profiles/mysql-python.cfg

 [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/

buildout/tests/assertSoftware.py

@@ -758,13 +758,13 @@ class AssertPythonMysql(AssertSoftwareMixin):
       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):