diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-03-19 13:45:10 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-20 09:28:07 -0700 |
commit | a6439a2179f8b6d514bc00f14f76ae71ea3bb5f0 (patch) | |
tree | a1262d9be6d5e6fff26c16422a0570a79e0adee2 /meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch | |
parent | 99b4f570ff7da277c407a86ad809086d433e813b (diff) | |
download | meta-openembedded-a6439a2179f8b6d514bc00f14f76ae71ea3bb5f0.tar.gz |
python3-blivet: upgrade 3.8.2 -> 3.9.1
0002-run_program-support-timeout.patch
0003-support-infinit-timeout.patch
0005-fix-incorrect-timeout-while-system-time-changed.patch
0006-tweak-btrfs-packages.patch
0007-invoking-mount-with-infinite-timeout.patch
0008-use-oe-variable-to-replace-hardcoded-dir.patch
0010-invoking-mkfs-with-infinite-timeout.patch
0011-invoking-dd-with-infinite-timeout.patch
refreshed for 3.9.1
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch')
-rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch index 9c5d53b430..795e4f1206 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f783b9b00da5df176fcd7927b752f574ca6db319 Mon Sep 17 00:00:00 2001 | 1 | From c645c83628b2290855cbd225e13c038ab75a7f74 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 26 Aug 2016 02:02:49 -0400 | 3 | Date: Fri, 26 Aug 2016 02:02:49 -0400 |
4 | Subject: [PATCH 05/11] fix incorrect timeout while system time changed | 4 | Subject: [PATCH 05/11] fix incorrect timeout while system time changed |
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
22 | 1 file changed, 3 insertions(+), 3 deletions(-) | 22 | 1 file changed, 3 insertions(+), 3 deletions(-) |
23 | 23 | ||
24 | diff --git a/blivet/util.py b/blivet/util.py | 24 | diff --git a/blivet/util.py b/blivet/util.py |
25 | index 7e89949..5571e73 100644 | 25 | index 58117ae..5bc5804 100644 |
26 | --- a/blivet/util.py | 26 | --- a/blivet/util.py |
27 | +++ b/blivet/util.py | 27 | +++ b/blivet/util.py |
28 | @@ -163,14 +163,14 @@ def timeout_command(argv, timeout, *args, **kwargs): | 28 | @@ -176,14 +176,14 @@ def timeout_command(argv, timeout, *args, **kwargs): |
29 | """call shell-command and either return its output or kill it | 29 | """call shell-command and either return its output or kill it |
30 | if it doesn't normally exit within timeout seconds and return None""" | 30 | if it doesn't normally exit within timeout seconds and return None""" |
31 | import subprocess, datetime, os, time, signal | 31 | import subprocess, datetime, os, time, signal |
@@ -43,6 +43,3 @@ index 7e89949..5571e73 100644 | |||
43 | os.kill(proc.pid, signal.SIGKILL) | 43 | os.kill(proc.pid, signal.SIGKILL) |
44 | os.waitpid(-1, os.WNOHANG) | 44 | os.waitpid(-1, os.WNOHANG) |
45 | program_log.debug("%d seconds timeout" % timeout) | 45 | program_log.debug("%d seconds timeout" % timeout) |
46 | -- | ||
47 | 2.7.4 | ||
48 | |||