Date: Monday, July 13, 2020 @ 17:06:54 Author: felixonmars Revision: 663453
upgpkg: python-openstackclient 5.3.0-2: attempt to fix https://storyboard.openstack.org/#!/story/2007917 Added: python-openstackclient/trunk/entry-point-compatibility.patch Modified: python-openstackclient/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 13 ++++++++++--- entry-point-compatibility.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-13 16:57:46 UTC (rev 663452) +++ PKGBUILD 2020-07-13 17:06:54 UTC (rev 663453) @@ -3,7 +3,7 @@ pkgname=python-openstackclient pkgver=5.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="OpenStack Command-line Client" arch=('any') url="https://docs.openstack.org/python-openstackclient/latest/"; @@ -12,11 +12,18 @@ 'python-keystoneauth1' 'python-osc-lib' 'python-oslo-utils' 'python-oslo-i18n' 'python-openstacksdk' 'python-glanceclient' 'python-novaclient' 'python-cinderclient') checkdepends=('python-ddt' 'python-oslotest' 'python-requests-mock') -source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/python-openstackclient/archive/$pkgver.tar.gz";) -sha512sums=('b13f0e3186ffb6e3e234785b65c79e7d5a8e822d0d1c1d8421cdd33671a7ce3320f77b8f2d2cefe6e4a8eec132dd48d9e3690ae798bb90dc09be9706e1f881bc') +source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/python-openstackclient/archive/$pkgver.tar.gz"; + entry-point-compatibility.patch) +sha512sums=('b13f0e3186ffb6e3e234785b65c79e7d5a8e822d0d1c1d8421cdd33671a7ce3320f77b8f2d2cefe6e4a8eec132dd48d9e3690ae798bb90dc09be9706e1f881bc' + '6e4119dda5b36f2eb5e2b7f5f4af1e1b2885bed32676b9652eb1d2c0a992b67406f717ff7d57e80c63dde87b160f9680f1aeeac348344050f66629d886ab756f') export PBR_VERSION=$pkgver +prepare() { + cd python-openstackclient-$pkgver + patch -p1 -i ../entry-point-compatibility.patch +} + build() { cd python-openstackclient-$pkgver python setup.py build Added: entry-point-compatibility.patch =================================================================== --- entry-point-compatibility.patch (rev 0) +++ entry-point-compatibility.patch 2020-07-13 17:06:54 UTC (rev 663453) @@ -0,0 +1,30 @@ +commit 9d0d64df8b5569f02892b1fd8690043bea7bfde7 +Author: Felix Yan <[email protected]> +Date: Tue Jul 14 01:02:00 2020 +0800 + + Fix compatibility issue in 5.3 + + The offending entry point object looks like: + EntryPoint(name='compute', value='openstackclient.compute.client', + group='openstack.cli.base') + + Fixes https://storyboard.openstack.org/#!/story/2007917 + + Change-Id: I0f3cc62e23efdc14203ce6645581d5ba5dbf7fa0 + +diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py +index 66dc880e..36c3ce26 100644 +--- a/openstackclient/common/clientmanager.py ++++ b/openstackclient/common/clientmanager.py +@@ -154,7 +154,10 @@ def get_plugin_modules(group): + try: + module_name = ep.entry_point.module_name + except AttributeError: +- module_name = ep.entry_point.module ++ try: ++ module_name = ep.entry_point.module ++ except AttributeError: ++ module_name = ep.entry_point.value + + try: + module = importlib.import_module(module_name)
