diff --git a/holland/PKGBUILD b/holland/PKGBUILD index 6253733..70e796e 100644 --- a/holland/PKGBUILD +++ b/holland/PKGBUILD @@ -4,19 +4,22 @@ pkgbase=holland pkgname=('holland' 'holland-common' 'holland-mysqldump' 'holland-mysqllvm' 'holland-pgdump' 'holland-xtrabackup') pkgver=1.0.10 -pkgrel=1 +pkgrel=2 changelog=holland.archlog arch=('any') url="http://hollandbackup.org" license=('BSD' 'GPL2') options=('emptydirs') makedepends=('python2' 'python2-setuptools' 'patch') -source=("http://hollandbackup.org/releases/stable/1.0/${pkgbase}-${pkgver}.tar.gz") -md5sums=('3435350d5c9dd57102e8b0470cd636c0') +source=("http://hollandbackup.org/releases/stable/1.0/${pkgbase}-${pkgver}.tar.gz" + "holland-1.0.10-cursor.patch") +md5sums=('3435350d5c9dd57102e8b0470cd636c0' + '765146149bd193c1deb57675695d4680') prepare() { cd "${srcdir}" find ./${pkgbase}-${pkgver} -name setup.cfg -exec rm -f {} \; + patch -p0 < holland-1.0.10-cursor.patch } build() { diff --git a/holland/holland-1.0.10-cursor.patch b/holland/holland-1.0.10-cursor.patch new file mode 100644 index 0000000..e77bc1a --- /dev/null +++ b/holland/holland-1.0.10-cursor.patch @@ -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] diff --git a/holland/holland.archlog b/holland/holland.archlog index 5d79e13..0a35c6a 100644 --- a/holland/holland.archlog +++ b/holland/holland.archlog @@ -1,3 +1,7 @@ +2014-12-11 Troy Engel + * 1.0.10-2 + Create patch for MySQL cursor.execute() bug (fixed upstream) + 2014-12-11 Troy Engel * 1.0.10-1 Initial release