1884866 - s-c-p: isAlive() is removed, use is_alive()
This commit is contained in:
parent
db48339aea
commit
158b07c1fd
48
0001-isAlive-is-removed-use-is_alive.patch
Normal file
48
0001-isAlive-is-removed-use-is_alive.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From cf7a74217558b19aff7c21a724878bcc15dc4e38 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Mon, 5 Oct 2020 09:26:40 +0200
|
||||||
|
Subject: [PATCH] isAlive() is removed, use is_alive()
|
||||||
|
|
||||||
|
---
|
||||||
|
asyncipp.py | 2 +-
|
||||||
|
timedops.py | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/asyncipp.py b/asyncipp.py
|
||||||
|
index 5bc160e0..61cd7213 100644
|
||||||
|
--- a/asyncipp.py
|
||||||
|
+++ b/asyncipp.py
|
||||||
|
@@ -269,7 +269,7 @@ class IPPConnection:
|
||||||
|
for binding in self.bindings:
|
||||||
|
delattr (self, binding)
|
||||||
|
|
||||||
|
- if self.thread.isAlive ():
|
||||||
|
+ if self.thread.is_alive ():
|
||||||
|
debugprint ("Stopping worker thread")
|
||||||
|
self.thread.stop ()
|
||||||
|
GLib.timeout_add_seconds (1, self._reap_thread)
|
||||||
|
diff --git a/timedops.py b/timedops.py
|
||||||
|
index 8a8741c8..111d575f 100644
|
||||||
|
--- a/timedops.py
|
||||||
|
+++ b/timedops.py
|
||||||
|
@@ -157,7 +157,7 @@ class OperationThread(threading.Thread):
|
||||||
|
self.exception = e
|
||||||
|
|
||||||
|
def collect_result (self):
|
||||||
|
- if self.isAlive ():
|
||||||
|
+ if self.is_alive ():
|
||||||
|
# We've been canceled.
|
||||||
|
raise OperationCanceled()
|
||||||
|
|
||||||
|
@@ -212,7 +212,7 @@ class TimedOperation(Timed):
|
||||||
|
return self.thread.collect_result ()
|
||||||
|
|
||||||
|
def _check_thread (self):
|
||||||
|
- if self.thread.isAlive ():
|
||||||
|
+ if self.thread.is_alive ():
|
||||||
|
# Thread still running.
|
||||||
|
return True
|
||||||
|
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
@ -9,7 +9,7 @@
|
|||||||
Summary: A printer administration tool
|
Summary: A printer administration tool
|
||||||
Name: system-config-printer
|
Name: system-config-printer
|
||||||
Version: 1.5.12
|
Version: 1.5.12
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/%{username}/%{name}
|
URL: https://github.com/%{username}/%{name}
|
||||||
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
@ -17,6 +17,7 @@ Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
|||||||
# all upstream patches, remove with new release
|
# all upstream patches, remove with new release
|
||||||
Patch01: 0001-udev-configure-printer-Add-checks-for-NULL.patch
|
Patch01: 0001-udev-configure-printer-Add-checks-for-NULL.patch
|
||||||
Patch02: system-config-printer-getchildren-removed.patch
|
Patch02: system-config-printer-getchildren-removed.patch
|
||||||
|
Patch03: 0001-isAlive-is-removed-use-is_alive.patch
|
||||||
|
|
||||||
# gcc is no longer in buildroot by default
|
# gcc is no longer in buildroot by default
|
||||||
# gcc is needed for udev-configure-printer.c
|
# gcc is needed for udev-configure-printer.c
|
||||||
@ -90,6 +91,7 @@ printers.
|
|||||||
# all backported from upstream
|
# all backported from upstream
|
||||||
%patch01 -p1 -b .udev-configure-segfault
|
%patch01 -p1 -b .udev-configure-segfault
|
||||||
%patch02 -p1 -b .getchildren-removed
|
%patch02 -p1 -b .getchildren-removed
|
||||||
|
%patch03 -p1 -b .isAlive-removed
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-udev-rules
|
%configure --with-udev-rules
|
||||||
@ -215,6 +217,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.12-9
|
||||||
|
- 1884866 - s-c-p: isAlive() is removed, use is_alive()
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.12-8
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.12-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user