mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
0a66130671
a/acl-2.3.0-x86_64-1.txz: Upgraded. a/attr-2.5.0-x86_64-1.txz: Upgraded. ap/hplip-3.20.5-x86_64-3.txz: Rebuilt. Switched to hplip-3.20.5 to fix regressions in the hp-plugin subsystem. Patched to use is_alive() rather than the deprecated isAlive(). Thanks to Andypoo. Newer versions than 3.20.6 require avahi. We'll stick with this version for now and leave the decision about whether we love HP more than we hate avahi for another day. d/doxygen-1.9.1-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.8.0esr-x86_64-2.txz: Rebuilt. Rebuilt with --enable-system-nss and --enable-system-nspr. Thanks to franzen. xap/mozilla-thunderbird-78.8.1-x86_64-2.txz: Rebuilt. Rebuilt with --enable-system-nss, --enable-system-nspr, and --disable-debug-symbols. Thanks to franzen. xap/seamonkey-2.53.6-x86_64-3.txz: Rebuilt. Rebuilt with --enable-system-nss and --enable-system-nspr. Thanks to franzen. xfce/exo-4.16.1-x86_64-1.txz: Upgraded.
94 lines
2.9 KiB
Diff
94 lines
2.9 KiB
Diff
diff --git a/copier/copier.py b/copier/copier.py
|
|
index a595baa..7794f48 100644
|
|
--- a/copier/copier.py
|
|
+++ b/copier/copier.py
|
|
@@ -73,13 +73,13 @@ class PMLCopyDevice(device.Device):
|
|
|
|
def isCopyActive(self):
|
|
if self.copy_thread is not None:
|
|
- return self.copy_thread.isAlive()
|
|
+ return self.copy_thread.is_alive()
|
|
else:
|
|
return False
|
|
|
|
def waitForCopyThread(self):
|
|
if self.copy_thread is not None and \
|
|
- self.copy_thread.isAlive():
|
|
+ self.copy_thread.is_alive():
|
|
|
|
self.copy_thread.join()
|
|
|
|
diff --git a/fax/fax.py b/fax/fax.py
|
|
index 3d69226..0878a64 100644
|
|
--- a/fax/fax.py
|
|
+++ b/fax/fax.py
|
|
@@ -478,13 +478,13 @@ class FaxDevice(device.Device):
|
|
|
|
def isSendFaxActive(self):
|
|
if self.send_fax_thread is not None:
|
|
- return self.send_fax_thread.isAlive()
|
|
+ return self.send_fax_thread.is_alive()
|
|
else:
|
|
return False
|
|
|
|
def waitForSendFaxThread(self):
|
|
if self.send_fax_thread is not None and \
|
|
- self.send_fax_thread.isAlive():
|
|
+ self.send_fax_thread.is_alive():
|
|
|
|
try:
|
|
self.send_fax_thread.join()
|
|
diff --git a/fax/pmlfax.py b/fax/pmlfax.py
|
|
index b68ff6a..b1020d0 100644
|
|
--- a/fax/pmlfax.py
|
|
+++ b/fax/pmlfax.py
|
|
@@ -179,13 +179,13 @@ class PMLFaxDevice(FaxDevice):
|
|
|
|
def isUploadLogActive(self):
|
|
if self.upload_log_thread is not None:
|
|
- return self.upload_log_thread.isAlive()
|
|
+ return self.upload_log_thread.is_alive()
|
|
else:
|
|
return False
|
|
|
|
def waitForUploadLogThread(self):
|
|
if self.upload_log_thread is not None and \
|
|
- self.upload_log_thread.isAlive():
|
|
+ self.upload_log_thread.is_alive():
|
|
|
|
self.upload_log_thread.join()
|
|
|
|
diff --git a/scan/sane.py b/scan/sane.py
|
|
index b6c4acd..e8f8db8 100755
|
|
--- a/scan/sane.py
|
|
+++ b/scan/sane.py
|
|
@@ -378,14 +378,14 @@ class ScanDevice:
|
|
|
|
def isScanActive(self):
|
|
if self.scan_thread is not None:
|
|
- return self.scan_thread.isAlive() and self.scan_thread.scan_active
|
|
+ return self.scan_thread.is_alive() and self.scan_thread.scan_active
|
|
else:
|
|
return False
|
|
|
|
|
|
def waitForScanDone(self):
|
|
if self.scan_thread is not None and \
|
|
- self.scan_thread.isAlive() and \
|
|
+ self.scan_thread.is_alive() and \
|
|
self.scan_thread.scan_active:
|
|
|
|
try:
|
|
@@ -398,9 +398,9 @@ class ScanDevice:
|
|
#time.sleep(0.5)
|
|
if self.scan_thread is not None:
|
|
while True:
|
|
- #print self.scan_thread.isAlive()
|
|
+ #print self.scan_thread.is_alive()
|
|
#print self.scan_thread.scan_active
|
|
- if self.scan_thread.isAlive() and \
|
|
+ if self.scan_thread.is_alive() and \
|
|
self.scan_thread.scan_active:
|
|
return
|
|
|
|
|