[packages/mysql-utilities] fix for bug MYSQL#66863

[glen]

commit ab83b9a880196168ac1f1e55b12b96d4fe586f02
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Oct 5 01:47:56 2012 +0300

    fix for bug MYSQL#66863

 bug-66863.patch      | 28 ++++++++++++++++++++++++++++
 mysql-utilities.spec |  2 ++
 2 files changed, 30 insertions(+)
---
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index 88e2cdc..8be319b 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -9,6 +9,7 @@ Source0:	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools
 # Source0-md5:	ea609fcd5d42333291a8ea6015627583
 Patch0:		mu-man.patch
 Patch1:		paths.patch
+Patch2:		bug-66863.patch
 URL:		https://code.launchpad.net/mysql-utilities
 BuildRequires:	python-Sphinx >= 1.0
 BuildRequires:	python-devel >= 1:2.4
@@ -29,6 +30,7 @@ mv mysql-workbench-gpl-*-src/ext/%{name}/* .
 %{__rm} -r mysql-workbench-gpl-*-src
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # build static list of mysql utilities
 # because otherwise it will try to run python --help for every *.py it finds from /usr/bin!
diff --git a/bug-66863.patch b/bug-66863.patch
new file mode 100644
index 0000000..21ba259
--- /dev/null
+++ b/bug-66863.patch
@@ -0,0 +1,28 @@
+seems to have got bronken with this commit:
+
+http://bazaar.launchpad.net/~mysql/mysql-utilities/trunk/revision/148#mysql/utilities/common/server.py
+
+or maybe even earlier
+
+--- mysql-utilities-1.1.0/./mysql/utilities/common/server.py~	2012-09-26 23:50:47.000000000 +0300
++++ mysql-utilities-1.1.0/./mysql/utilities/common/server.py	2012-10-05 01:30:37.440326297 +0300
+@@ -330,7 +330,7 @@
+     if not _require_version(source, version):
+         raise UtilError("The %s version is incompatible. Utility "
+                         "requires version %s or higher." %
+-                        (source.name, version))
++                        (source.host, version))
+ 
+     # If not cloning, connect to the destination server and check version
+     if not cloning:
+--- mysql-utilities-1.1.0/./mysql/utilities/common/server.py~	2012-10-05 01:31:09.000000000 +0300
++++ mysql-utilities-1.1.0/./mysql/utilities/common/server.py	2012-10-05 01:42:07.724991092 +0300
+@@ -343,7 +343,7 @@
+         if not _require_version(destination, version):
+             raise UtilError("The %s version is incompatible. Utility "
+                             "requires version %s or higher." %
+-                            (destination.name, version))
++                            (destination.host, version))
+     elif not quiet and dest_dict is not None and \
+          not isinstance(dest_val, Server):
+         _print_connection(dest_name, src_dict)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-utilities.git/commitdiff/ab83b9a880196168ac1f1e55b12b96d4fe586f02