summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch')
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
index 38f061ed0..861b2cdd4 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
@@ -1,4 +1,4 @@
1From 325898f3f2951bbde07da47888175c427b11ddc3 Mon Sep 17 00:00:00 2001 1From 5d5436dfa3bdde7b4e87ce5a40cbc724199847d6 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:18:02 +0800 3Date: Mon, 8 May 2017 16:18:02 +0800
4Subject: [PATCH 03/11] support infinit timeout 4Subject: [PATCH 03/11] support infinit timeout
@@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 1 file changed, 8 insertions(+), 4 deletions(-) 11 1 file changed, 8 insertions(+), 4 deletions(-)
12 12
13diff --git a/blivet/util.py b/blivet/util.py 13diff --git a/blivet/util.py b/blivet/util.py
14index 05a253c..d6804be 100644 14index 4f05076..7e89949 100644
15--- a/blivet/util.py 15--- a/blivet/util.py
16+++ b/blivet/util.py 16+++ b/blivet/util.py
17@@ -157,6 +157,7 @@ class Path(str): 17@@ -158,6 +158,7 @@ class Path(str):
18 def __hash__(self): 18 def __hash__(self):
19 return self._path.__hash__() 19 return self._path.__hash__()
20 20
@@ -22,7 +22,7 @@ index 05a253c..d6804be 100644
22 def timeout_command(argv, timeout, *args, **kwargs): 22 def timeout_command(argv, timeout, *args, **kwargs):
23 """call shell-command and either return its output or kill it 23 """call shell-command and either return its output or kill it
24 if it doesn't normally exit within timeout seconds and return None""" 24 if it doesn't normally exit within timeout seconds and return None"""
25@@ -168,7 +169,7 @@ def timeout_command(argv, timeout, *args, **kwargs): 25@@ -169,7 +170,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
26 while proc.poll() is None: 26 while proc.poll() is None:
27 time.sleep(0.1) 27 time.sleep(0.1)
28 now = datetime.datetime.now() 28 now = datetime.datetime.now()
@@ -31,7 +31,7 @@ index 05a253c..d6804be 100644
31 os.kill(proc.pid, signal.SIGKILL) 31 os.kill(proc.pid, signal.SIGKILL)
32 os.waitpid(-1, os.WNOHANG) 32 os.waitpid(-1, os.WNOHANG)
33 program_log.debug("%d seconds timeout" % timeout) 33 program_log.debug("%d seconds timeout" % timeout)
34@@ -182,7 +183,7 @@ def timeout_command(argv, timeout, *args, **kwargs): 34@@ -183,7 +184,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
35 program_log.debug("Return code: %d", proc.returncode) 35 program_log.debug("Return code: %d", proc.returncode)
36 return (proc.returncode, proc.stdout.read()) 36 return (proc.returncode, proc.stdout.read())
37 37
@@ -40,7 +40,7 @@ index 05a253c..d6804be 100644
40 if env_prune is None: 40 if env_prune is None:
41 env_prune = [] 41 env_prune = []
42 42
43@@ -191,7 +192,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa 43@@ -192,7 +193,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
44 os.chroot(root) 44 os.chroot(root)
45 45
46 with program_log_lock: # pylint: disable=not-context-manager 46 with program_log_lock: # pylint: disable=not-context-manager
@@ -52,7 +52,7 @@ index 05a253c..d6804be 100644
52 52
53 env = os.environ.copy() 53 env = os.environ.copy()
54 env.update({"LC_ALL": "C", 54 env.update({"LC_ALL": "C",
55@@ -204,7 +208,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa 55@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
56 else: 56 else:
57 stderr_dir = subprocess.PIPE 57 stderr_dir = subprocess.PIPE
58 58