Package: debdelta
Version: 0.65
Followup-For: Bug #962203
X-Debbugs-Cc: calumlikesapple...@gmail.com
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
I have created an attached a patch. It is also availible as merge request !2
in the salsa repository.
- -- System Information:
Debian Release: bullseye/sid
APT prefers testing-debug
APT policy: (500, 'testing-debug'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.9.0-1-amd64 (SMP w/4 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages debdelta depends on:
ii binutils 2.35.1-3
ii bzip2 1.0.8-4
ii libbz2-1.0 1.0.8-4
ii libc6 2.31-4
ii python3 3.8.6-1
ii python3-requests 2.24.0+dfsg-1
ii zlib1g 1:1.2.11.dfsg-2
Versions of packages debdelta recommends:
ii bsdiff 4.3-21+b1
ii gnupg-agent 2.2.20-1
ii gnupg2 2.2.20-1
ii gpg-agent [gnupg-agent] 2.2.20-1
ii python3-apt 2.1.6
ii python3-debian 0.1.38
ii xdelta 1.1.3-9.3
ii xdelta3 3.0.11-dfsg-1+b1
ii xz-utils [lzma] 5.2.4-1+b1
Versions of packages debdelta suggests:
ii debdelta-doc 0.65
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
iQJRBAEBCgA7FiEE/vC/PEGxsMPJ5u5w7/Xh1+DNmzIFAl/NHNgdHGNhbHVtbGlr
ZXNhcHBsZXBpZUBnbWFpbC5jb20ACgkQ7/Xh1+DNmzK5rA//S3+ySeshMWhTEp38
KOrKKWvR/vGOb2MjPILXU6VJfAcw7tIf/IbzvGkj3QM08f1eF3RElP4UwC4NCpj6
oTEYgq88lE0YTqYrdRJopM70pmcDArzvFpysudonUHJ8k2sUwr/5R18S8BooiGDw
iOs7BaAv3vJNyKfeYSJlIdMLiq1u52z6xooSg92Rb6b/rBC3il5frkpUsy4L/Jid
AHEGDhTAtyvwof/zdyjwVnMQvxoS5lsm5hkc7RNFpndkvRONTWNNOa0raYucbQ3K
vitJ+7BuNZ3GF/yi86+L1krOGpv5E5lbdlmhtqUMd1RcYw1VZpEcJ+3D45dDOxSg
wbIFV+ud+ATXC7yVYMQhDv/S3GSb/sKx7OrLJZX/67BrQZqMM3eB4BXarJe1o9gV
56znmh+hzGoGkzaZJmKHRNdhYK97rWXYts/4pUAnpICDkhMBbQ/D4OgVgA18dRR6
h4CsU+ynf0Z6Xb0bW9tPmkbj0a91mOvqNRvO1E9kwnSolsAjqJQ7HmQp0GLnDQfy
nxdCMGTIQOIWepdF8bi2WiGaSwvK2f2Q1LyxqEMsBf68uH3+IcCxsPKCrZ55w+gy
7NxRvlLwYilTFN20aZSTtFt7ntDPzLy6J9BulukLNjgD1AoW00Y/mlG+Af/hxMhc
fNhgaK9EUfEhOQeqOyoorBwEjok=
=4QZH
-----END PGP SIGNATURE-----
>From 4821b3f1fdb9118ba3c80b8077af63b5006d6ddb Mon Sep 17 00:00:00 2001
From: Calum McConnell <calumlikesapple...@gmail.com>
Date: Sun, 6 Dec 2020 12:53:52 -0500
Subject: [PATCH] Fix isAlive -> is_alive
---
debdelta/debdelta | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debdelta/debdelta b/debdelta/debdelta
index b4a79c1..b7f258c 100755
--- a/debdelta/debdelta
+++ b/debdelta/debdelta
@@ -5460,9 +5460,9 @@ def delta_upgrade_(args):
#do something useful in the meantime
debs_down_size=0
debs_down_time=0
- if patching_thread.isAlive() and no_delta and VERBOSE > 1 :
+ if patching_thread.is_alive() and no_delta and VERBOSE > 1 :
logger.info(' Downloading deltas done, downloading debs while waiting for
patching thread.')
- while patching_thread.isAlive() or ('a' in DEB_POLICY and no_delta):
+ while patching_thread.is_alive() or ('a' in DEB_POLICY and no_delta):
if no_delta:
uri, newdeb = no_delta.pop()
thread_returns['downloaduri']=os.path.basename(uri)
@@ -5481,12 +5481,12 @@ def delta_upgrade_(args):
if http_conns[i] != None :
http_conns[i].close()
- while patching_thread.isAlive():
+ while patching_thread.is_alive():
time.sleep(0.1)
#terminate progress report
thread_returns['STOP']=True
- while progress_thread != None and progress_thread.isAlive():
+ while progress_thread != None and progress_thread.is_alive():
time.sleep(0.1)
if DO_PROGRESS:
--
2.29.2
