implementing cursor patch
This commit is contained in:
parent
7ec3f299cd
commit
0e3cea46f2
3 changed files with 21 additions and 3 deletions
|
|
@ -4,19 +4,22 @@ pkgbase=holland
|
||||||
pkgname=('holland' 'holland-common' 'holland-mysqldump' 'holland-mysqllvm'
|
pkgname=('holland' 'holland-common' 'holland-mysqldump' 'holland-mysqllvm'
|
||||||
'holland-pgdump' 'holland-xtrabackup')
|
'holland-pgdump' 'holland-xtrabackup')
|
||||||
pkgver=1.0.10
|
pkgver=1.0.10
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
changelog=holland.archlog
|
changelog=holland.archlog
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="http://hollandbackup.org"
|
url="http://hollandbackup.org"
|
||||||
license=('BSD' 'GPL2')
|
license=('BSD' 'GPL2')
|
||||||
options=('emptydirs')
|
options=('emptydirs')
|
||||||
makedepends=('python2' 'python2-setuptools' 'patch')
|
makedepends=('python2' 'python2-setuptools' 'patch')
|
||||||
source=("http://hollandbackup.org/releases/stable/1.0/${pkgbase}-${pkgver}.tar.gz")
|
source=("http://hollandbackup.org/releases/stable/1.0/${pkgbase}-${pkgver}.tar.gz"
|
||||||
md5sums=('3435350d5c9dd57102e8b0470cd636c0')
|
"holland-1.0.10-cursor.patch")
|
||||||
|
md5sums=('3435350d5c9dd57102e8b0470cd636c0'
|
||||||
|
'765146149bd193c1deb57675695d4680')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "${srcdir}"
|
cd "${srcdir}"
|
||||||
find ./${pkgbase}-${pkgver} -name setup.cfg -exec rm -f {} \;
|
find ./${pkgbase}-${pkgver} -name setup.cfg -exec rm -f {} \;
|
||||||
|
patch -p0 < holland-1.0.10-cursor.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
||||||
11
holland/holland-1.0.10-cursor.patch
Normal file
11
holland/holland-1.0.10-cursor.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- holland-1.0.10/plugins/holland.lib.mysql/holland/lib/mysql/client/base.py.orig 2013-07-29 16:49:37.000000000 -0500
|
||||||
|
+++ holland-1.0.10/plugins/holland.lib.mysql/holland/lib/mysql/client/base.py 2014-12-11 21:36:42.154264669 -0600
|
||||||
|
@@ -178,7 +178,7 @@
|
||||||
|
"LEFT JOIN INFORMATION_SCHEMA.ENGINES USING (ENGINE) "
|
||||||
|
"WHERE TABLE_SCHEMA = %s")
|
||||||
|
cursor = self.cursor()
|
||||||
|
- cursor.execute(sql, (database))
|
||||||
|
+ cursor.execute(sql, (database,))
|
||||||
|
names = [info[0] for info in cursor.description]
|
||||||
|
all_rows = cursor.fetchall()
|
||||||
|
result = [dict(zip(names, row)) for row in all_rows]
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
|
2014-12-11 Troy Engel <troyengel+arch@gmail.com>
|
||||||
|
* 1.0.10-2
|
||||||
|
Create patch for MySQL cursor.execute() bug (fixed upstream)
|
||||||
|
|
||||||
2014-12-11 Troy Engel <troyengel+arch@gmail.com>
|
2014-12-11 Troy Engel <troyengel+arch@gmail.com>
|
||||||
* 1.0.10-1
|
* 1.0.10-1
|
||||||
Initial release
|
Initial release
|
||||||
|
|
|
||||||
Reference in a new issue