diff options
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.patch | 17 |
1 files changed, 7 insertions, 10 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 861b2cdd46..8ab65a3e22 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 @@ -From 5d5436dfa3bdde7b4e87ce5a40cbc724199847d6 Mon Sep 17 00:00:00 2001 +From 112b825541f498762f373cfc9918e444dda74095 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 8 May 2017 16:18:02 +0800 Subject: [PATCH 03/11] support infinit timeout @@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index 4f05076..7e89949 100644 +index a5da7b6..58117ae 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -158,6 +158,7 @@ class Path(str): +@@ -171,6 +171,7 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -22,7 +22,7 @@ index 4f05076..7e89949 100644 def timeout_command(argv, timeout, *args, **kwargs): """call shell-command and either return its output or kill it if it doesn't normally exit within timeout seconds and return None""" -@@ -169,7 +170,7 @@ def timeout_command(argv, timeout, *args, **kwargs): +@@ -182,7 +183,7 @@ def timeout_command(argv, timeout, *args, **kwargs): while proc.poll() is None: time.sleep(0.1) now = datetime.datetime.now() @@ -31,7 +31,7 @@ index 4f05076..7e89949 100644 os.kill(proc.pid, signal.SIGKILL) os.waitpid(-1, os.WNOHANG) program_log.debug("%d seconds timeout" % timeout) -@@ -183,7 +184,7 @@ def timeout_command(argv, timeout, *args, **kwargs): +@@ -196,7 +197,7 @@ def timeout_command(argv, timeout, *args, **kwargs): program_log.debug("Return code: %d", proc.returncode) return (proc.returncode, proc.stdout.read()) @@ -40,7 +40,7 @@ index 4f05076..7e89949 100644 if env_prune is None: env_prune = [] -@@ -192,7 +193,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -205,7 +206,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa os.chroot(root) with program_log_lock: # pylint: disable=not-context-manager @@ -52,7 +52,7 @@ index 4f05076..7e89949 100644 env = os.environ.copy() env.update({"LC_ALL": "C", -@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -218,7 +222,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa else: stderr_dir = subprocess.PIPE @@ -61,6 +61,3 @@ index 4f05076..7e89949 100644 stdin=stdin, stdout=subprocess.PIPE, stderr=stderr_dir, --- -2.7.4 - |