2.0.0-3 - Fix Python 3.7 incompatibility (otherwise missed...
...in bytecompilation phase, see rhbz#1616219) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
parent
3847f2ef29
commit
6e88051f14
46
9dc14b55077567099a13b71ac87816f608b044a9.patch
Normal file
46
9dc14b55077567099a13b71ac87816f608b044a9.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 9dc14b55077567099a13b71ac87816f608b044a9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
||||||
|
Date: Wed, 15 Aug 2018 10:52:49 +0200
|
||||||
|
Subject: [PATCH] Maint: cts: refrain from async (await) in Python code for
|
||||||
|
being reserved
|
||||||
|
|
||||||
|
... as of Python 3.7:
|
||||||
|
https://docs.python.org/3/whatsnew/3.7.html#summary-release-highlights
|
||||||
|
|
||||||
|
One of the instance attributes turned out to be bogus.
|
||||||
|
|
||||||
|
Randomly spotted; unfortunately byte compilation when building package
|
||||||
|
for Fedora will not consider unability to pregenerate bytecode a fatal
|
||||||
|
problem.
|
||||||
|
---
|
||||||
|
cts/remote.py | 1 -
|
||||||
|
cts/watcher.py | 4 ++--
|
||||||
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cts/remote.py b/cts/remote.py
|
||||||
|
index af18d410c6..e5e4c276a2 100644
|
||||||
|
--- a/cts/remote.py
|
||||||
|
+++ b/cts/remote.py
|
||||||
|
@@ -140,7 +140,6 @@ class uses ssh.
|
||||||
|
'''
|
||||||
|
|
||||||
|
def __init__(self, rsh, silent=False):
|
||||||
|
- self.async = []
|
||||||
|
self.rsh = rsh
|
||||||
|
self.silent = silent
|
||||||
|
self.logger = LogFactory()
|
||||||
|
diff --git a/cts/watcher.py b/cts/watcher.py
|
||||||
|
index f3ca5806ee..56239eaf8b 100644
|
||||||
|
--- a/cts/watcher.py
|
||||||
|
+++ b/cts/watcher.py
|
||||||
|
@@ -47,8 +47,8 @@ def debug(self, args):
|
||||||
|
self.logger.debug(message)
|
||||||
|
|
||||||
|
def harvest(self, delegate=None):
|
||||||
|
- async = self.harvest_async(delegate)
|
||||||
|
- async.join()
|
||||||
|
+ async_task = self.harvest_async(delegate)
|
||||||
|
+ async_task.join()
|
||||||
|
|
||||||
|
def harvest_async(self, delegate=None):
|
||||||
|
self.log("Not implemented")
|
@ -14,7 +14,7 @@
|
|||||||
## can be incremented to build packages reliably considered "newer"
|
## can be incremented to build packages reliably considered "newer"
|
||||||
## than previously built packages with the same pcmkversion)
|
## than previously built packages with the same pcmkversion)
|
||||||
%global pcmkversion 2.0.0
|
%global pcmkversion 2.0.0
|
||||||
%global specversion 2
|
%global specversion 3
|
||||||
|
|
||||||
## Upstream commit (or git tag, such as "Pacemaker-" plus the
|
## Upstream commit (or git tag, such as "Pacemaker-" plus the
|
||||||
## {pcmkversion} macro for an official release) to use for this package
|
## {pcmkversion} macro for an official release) to use for this package
|
||||||
@ -137,6 +137,7 @@ Source1: https://github.com/%{github_owner}/%{nagios_name}/archive/%{nagio
|
|||||||
# ---
|
# ---
|
||||||
# patches go here
|
# patches go here
|
||||||
Patch0: rhbz1611631.patch
|
Patch0: rhbz1611631.patch
|
||||||
|
Patch1: https://github.com/ClusterLabs/pacemaker/commit/9dc14b55077567099a13b71ac87816f608b044a9.patch
|
||||||
|
|
||||||
Provides: pcmk-cluster-manager
|
Provides: pcmk-cluster-manager
|
||||||
Requires: resource-agents
|
Requires: resource-agents
|
||||||
@ -675,6 +676,10 @@ exit 0
|
|||||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 15 2018 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.0-3
|
||||||
|
- Fix Python 3.7 incompatibility (otherwise missed in bytecompilation phase,
|
||||||
|
see rhbz#1616219)
|
||||||
|
|
||||||
* Thu Aug 09 2018 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.0-2
|
* Thu Aug 09 2018 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.0-2
|
||||||
- Include fix for "cibadmin --upgrade" related issues (rhbz#1611631)
|
- Include fix for "cibadmin --upgrade" related issues (rhbz#1611631)
|
||||||
- Adapt spec file more akin to upstream version including:
|
- Adapt spec file more akin to upstream version including:
|
||||||
|
Loading…
Reference in New Issue
Block a user