mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-28 03:51:35 +01:00
962bf09a6c
* enable build for x86 and armv7 * patches by Vladimir Bashkirtsev remove systemd patch remove git patch that is reversed upstream fix checksums
16 lines
912 B
Diff
16 lines
912 B
Diff
diff -uNr ceph-15.2.4/src/pybind/ceph_argparse.py ceph-15.2.4-fix_ceph_thread_timeout/src/pybind/ceph_argparse.py
|
|
--- ceph-15.2.4/src/pybind/ceph_argparse.py 2020-07-01 01:10:51.000000000 +0930
|
|
+++ ceph-15.2.4-fix_ceph_thread_timeout/src/pybind/ceph_argparse.py 2020-11-18 18:57:39.711443174 +1030
|
|
@@ -1317,9 +1317,8 @@
|
|
if timeout == 0 or timeout == None:
|
|
# python threading module will just get blocked if timeout is `None`,
|
|
# otherwise it will keep polling until timeout or thread stops.
|
|
- # wait for INT32_MAX, as python 3.6.8 use int32_t to present the
|
|
- # timeout in integer when converting it to nanoseconds
|
|
- timeout = (1 << (32 - 1)) - 1
|
|
+ # wait for 5 seconds, as python 3.6.8 use float to present the timeout
|
|
+ timeout = 5.0
|
|
t = RadosThread(func, *args, **kwargs)
|
|
|
|
# allow the main thread to exit (presumably, avoid a join() on this
|