[arch-commits] Commit in buildbot/trunk (PKGBUILD sqlalchemy-1.13.18.diff)

[Chih-Hsuan Yen]

    Date: Tuesday, June 30, 2020 @ 11:29:21
  Author: yan12125
Revision: 657153

buildbot: add a patch for compatibility with SQLAlchemy 1.13.18

Ref: https://github.com/buildbot/buildbot/pull/5387#issuecomment-651732731

Added:
  buildbot/trunk/sqlalchemy-1.13.18.diff
Modified:
  buildbot/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    7 +++++--
 sqlalchemy-1.13.18.diff |   13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-30 10:42:23 UTC (rev 657152)
+++ PKGBUILD	2020-06-30 11:29:21 UTC (rev 657153)
@@ -26,11 +26,13 @@
              git yarn)
 source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc}
         "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
-        "reproducible-html.diff")
+        "reproducible-html.diff"
+        "sqlalchemy-1.13.18.diff")
 sha256sums=('e5ef72bba5eee9f84f5c2df45fb6238537714c7ce9f9838418d385a3722948c9'
             'SKIP'
             'SKIP'
-            'b921d29994eff3af134ca1b37acf291a6a95f5da35a2a4f885557adcca22f864')
+            'b921d29994eff3af134ca1b37acf291a6a95f5da35a2a4f885557adcca22f864'
+            'cd6119e8f8346ad2bcfedb3bfdbfcdcbb9908ea1db9f3ec09d323f6c9d13d9df')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
@@ -39,6 +41,7 @@
 prepare() {
   cd buildbot-$pkgver
   patch -Np1 -i ../reproducible-html.diff
+  patch -Np1 -i ../sqlalchemy-1.13.18.diff
 
   # HACK: do not use virtualenv
   sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile

Added: sqlalchemy-1.13.18.diff
===================================================================
--- sqlalchemy-1.13.18.diff	                        (rev 0)
+++ sqlalchemy-1.13.18.diff	2020-06-30 11:29:21 UTC (rev 657153)
@@ -0,0 +1,13 @@
+diff --git a/master/buildbot/db/enginestrategy.py b/master/buildbot/db/enginestrategy.py
+index 7cd014e37..cb835602b 100644
+--- a/master/buildbot/db/enginestrategy.py
++++ b/master/buildbot/db/enginestrategy.py
+@@ -216,7 +216,7 @@ class BuildbotEngineStrategy(strategies.PlainEngineStrategy):
+                 raise TypeError("Buildbot requires use_unicode=True " +
+                                 "(and adds it automatically)")
+         else:
+-            u.query['use_unicode'] = True
++            u.query['use_unicode'] = "True"
+ 
+         if 'charset' in u.query:
+             if u.query['charset'] != "utf8":