Date: Sunday, September 12, 2021 @ 02:42:11 Author: felixonmars Revision: 1014403
archrelease: copy trunk to community-any Added: python-openstackclient/repos/community-any/PKGBUILD (from rev 1014402, python-openstackclient/trunk/PKGBUILD) python-openstackclient/repos/community-any/entry-point-compatibility.patch (from rev 1014402, python-openstackclient/trunk/entry-point-compatibility.patch) Deleted: python-openstackclient/repos/community-any/PKGBUILD python-openstackclient/repos/community-any/entry-point-compatibility.patch ---------------------------------+ PKGBUILD | 66 +++++++++++++++++++------------------- entry-point-compatibility.patch | 60 +++++++++++++++++----------------- 2 files changed, 63 insertions(+), 63 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-09-12 02:42:00 UTC (rev 1014402) +++ PKGBUILD 2021-09-12 02:42:11 UTC (rev 1014403) @@ -1,33 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> - -pkgname=python-openstackclient -pkgver=5.5.0 -pkgrel=1 -pkgdesc="OpenStack Command-line Client" -arch=('any') -url="https://docs.openstack.org/python-openstackclient/latest/" -license=('Apache') -depends=('python-six' 'python-pbr' 'python-babel' 'python-cliff' 'python-keystoneclient' - '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=("https://github.com/openstack/python-openstackclient/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha512sums=('e0c9a9799400d41c34ae3ce03484a524318001febc6a730554eaf6c975666b02377f61c64f681cfaa93b831484bf48f906cdaf450125deab776d3c5d8c8c4d43') - -export PBR_VERSION=$pkgver - -build() { - cd python-openstackclient-$pkgver - python setup.py build -} - -check() { - cd python-openstackclient-$pkgver - stestr run || echo "Tests failed: https://storyboard.openstack.org/#!/story/2003143" -} - -package() { - cd python-openstackclient-$pkgver - python setup.py install --root="$pkgdir" --optimize=1 -} Copied: python-openstackclient/repos/community-any/PKGBUILD (from rev 1014402, python-openstackclient/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-09-12 02:42:11 UTC (rev 1014403) @@ -0,0 +1,33 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> + +pkgname=python-openstackclient +pkgver=5.6.0 +pkgrel=1 +pkgdesc="OpenStack Command-line Client" +arch=('any') +url="https://docs.openstack.org/python-openstackclient/latest/" +license=('Apache') +depends=('python-six' 'python-pbr' 'python-babel' 'python-cliff' 'python-keystoneclient' + '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=("https://github.com/openstack/python-openstackclient/archive/$pkgver/$pkgname-$pkgver.tar.gz") +sha512sums=('0834a78d898f6f6854e1c79381f5976e21ffc5dc671d37f868ea8d0b66f588b9c9bf1f273e8076e0c951b1af02e9bb2439d2d23a0a2c95095082db74000354d9') + +export PBR_VERSION=$pkgver + +build() { + cd python-openstackclient-$pkgver + python setup.py build +} + +check() { + cd python-openstackclient-$pkgver + stestr run || echo "Tests failed: https://storyboard.openstack.org/#!/story/2003143" +} + +package() { + cd python-openstackclient-$pkgver + python setup.py install --root="$pkgdir" --optimize=1 +} Deleted: entry-point-compatibility.patch =================================================================== --- entry-point-compatibility.patch 2021-09-12 02:42:00 UTC (rev 1014402) +++ entry-point-compatibility.patch 2021-09-12 02:42:11 UTC (rev 1014403) @@ -1,30 +0,0 @@ -commit 9d0d64df8b5569f02892b1fd8690043bea7bfde7 -Author: Felix Yan <felixonm...@archlinux.org> -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) Copied: python-openstackclient/repos/community-any/entry-point-compatibility.patch (from rev 1014402, python-openstackclient/trunk/entry-point-compatibility.patch) =================================================================== --- entry-point-compatibility.patch (rev 0) +++ entry-point-compatibility.patch 2021-09-12 02:42:11 UTC (rev 1014403) @@ -0,0 +1,30 @@ +commit 9d0d64df8b5569f02892b1fd8690043bea7bfde7 +Author: Felix Yan <felixonm...@archlinux.org> +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)