[arch-commits] Commit in python-heatclient/trunk (PKGBUILD python310.patch)

Evangelos Foutras foutrelis at gemini.archlinux.org
Mon Dec 6 22:18:42 UTC 2021


    Date: Monday, December 6, 2021 @ 22:18:41
  Author: foutrelis
Revision: 1065409

Use Mapping from collections.abc

Added:
  python-heatclient/trunk/python310.patch
Modified:
  python-heatclient/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    7 ++++---
 python310.patch |   16 ++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-06 22:07:26 UTC (rev 1065408)
+++ PKGBUILD	2021-12-06 22:18:41 UTC (rev 1065409)
@@ -13,14 +13,15 @@
          'python-keystoneauth1' 'python-swiftclient' 'python-yaml' 'python-requests' 'python-six')
 checkdepends=('python-stestr' 'python-testscenarios' 'python-requests-mock')
 source=("https://github.com/openstack/python-heatclient/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        $pkgname-python3.9.patch::https://github.com/openstack/python-heatclient/commit/2b6f6ac284e4e749a8f6cf627cdc00c54a05f422.patch)
+        python310.patch)
 sha512sums=('1c6e64dd7d799d0ea7c29fbb36959c9e61cce620535b9952d05bf74cef48ded34465e7c3ab1fb1aefe60104c8cdf837047a68af6560fc37cf5a924962b9a8b99'
-            '2e0628ec2deab33f0489978021e4997c4395b889dfaa500f924424a99b490fa077b5ff70e5efbe9c4846c644a2d52841d528755e138b3049c9dd1c8c8bfecddf')
+            '54b651d540235e83f1a7ef96c62f11c842564dbb522c6fe4ec9e5dfb42e965317d99d70bd1d6b2068b9a33159de4f40958f1b61a9439026f808e6fd9c70bd168')
 
 export PBR_VERSION=$pkgver
 
 prepare() {
-  patch -d python-heatclient-$pkgver -p1 < $pkgname-python3.9.patch || :
+  cd python-heatclient-$pkgver
+  patch -Np1 -i ../python310.patch
 }
 
 build() {

Added: python310.patch
===================================================================
--- python310.patch	                        (rev 0)
+++ python310.patch	2021-12-06 22:18:41 UTC (rev 1065409)
@@ -0,0 +1,16 @@
+diff -upr python-heatclient-2.4.0.orig/heatclient/common/template_utils.py python-heatclient-2.4.0/heatclient/common/template_utils.py
+--- python-heatclient-2.4.0.orig/heatclient/common/template_utils.py	2021-07-06 15:24:33.000000000 +0300
++++ python-heatclient-2.4.0/heatclient/common/template_utils.py	2021-12-07 00:15:41.635946307 +0200
+@@ -203,10 +203,10 @@ def deep_update(old, new):
+         old = {}
+ 
+     for k, v in new.items():
+-        if isinstance(v, collections.Mapping):
++        if isinstance(v, collections.abc.Mapping):
+             r = deep_update(old.get(k, {}), v)
+             old[k] = r
+-        elif v is None and isinstance(old.get(k), collections.Mapping):
++        elif v is None and isinstance(old.get(k), collections.abc.Mapping):
+             # Don't override empty data, to work around yaml syntax issue
+             pass
+         else:



More information about the arch-commits mailing list