[Python-modules-commits] [mysql-connector-python] 06/09: support MariaDB versioning schema and search binaries only in directories with 'bin' in their name

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository mysql-connector-python.

commit 5b93d394f6b794923f738714ab26556cb0cb44ca
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Dec 17 19:48:45 2016 -0500

    support MariaDB versioning schema and search binaries only in directories with 'bin' in their name
---
 debian/changelog                                   |  5 ++++-
 debian/patches/series                              |  1 +
 ...support_alternative_mysqld_implementation.patch | 25 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 062dbee..89bf3cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ mysql-connector-python (2.1.5-1) UNRELEASED; urgency=medium
   * debian/control
     - adjust b-d to "default-mysql-server | virtual-mysql-server", for new
       default mysql server provider; Closes: #848291
+  * debian/patches/support_alternative_mysqld_implementation.patch
+    - support MariaDB versioning schema and search binaries only in directories
+      with 'bin' in their name
 
- -- Sandro Tosi <morph at debian.org>  Sat, 17 Dec 2016 16:31:41 -0500
+ -- Sandro Tosi <morph at debian.org>  Sat, 17 Dec 2016 19:48:07 -0500
 
 mysql-connector-python (2.1.3-1) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a3953cd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+support_alternative_mysqld_implementation.patch
diff --git a/debian/patches/support_alternative_mysqld_implementation.patch b/debian/patches/support_alternative_mysqld_implementation.patch
new file mode 100644
index 0000000..18e7380
--- /dev/null
+++ b/debian/patches/support_alternative_mysqld_implementation.patch
@@ -0,0 +1,25 @@
+--- a/tests/mysqld.py
++++ b/tests/mysqld.py
+@@ -186,11 +186,11 @@ class MySQLServerBase(object):
+             if self._sbindir:
+                 break
+             for afile in files:
+-                if (afile == EXEC_MYSQLD and
++                if (afile == EXEC_MYSQLD and 'bin' in root and
+                         os.access(os.path.join(root, afile), 0)):
+                     self._sbindir = root
+                     files_to_find.remove(EXEC_MYSQLD)
+-                elif (afile == EXEC_MYSQL and
++                elif (afile == EXEC_MYSQL and 'bin' in root and
+                         os.access(os.path.join(root, afile), 0)):
+                     self._bindir = root
+                     files_to_find.remove(EXEC_MYSQL)
+@@ -289,7 +289,7 @@ class MySQLServerBase(object):
+ 
+         prc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=DEVNULL)
+         verstr = str(prc.communicate()[0])
+-        matches = re.match(r'.*Ver (\d)\.(\d).(\d{1,2}).*', verstr)
++        matches = re.match(r'.*Ver (\d{1,2})\.(\d).(\d{1,2}).*', verstr)
+         if matches:
+             return tuple([int(v) for v in matches.groups()])
+         else:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mysql-connector-python.git