1From 5d5436dfa3bdde7b4e87ce5a40cbc724199847d6 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:18:02 +0800
4Subject: [PATCH 03/11] support infinit timeout
5
6Upstream-Status: Pending
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 blivet/util.py | 12 ++++++++----
11 1 file changed, 8 insertions(+), 4 deletions(-)
12
13diff --git a/blivet/util.py b/blivet/util.py
14index 4f05076..7e89949 100644
15--- a/blivet/util.py
16+++ b/blivet/util.py
17@@ -158,6 +158,7 @@ class Path(str):
18     def __hash__(self):
19         return self._path.__hash__()
20
21+# timeout = -1 means infinite timeout, always wait.
22 def timeout_command(argv, timeout, *args, **kwargs):
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"""
25@@ -169,7 +170,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
26         while proc.poll() is None:
27             time.sleep(0.1)
28             now = datetime.datetime.now()
29-            if (now - start).seconds> timeout:
30+            if timeout != -1 and (now - start).seconds> timeout:
31                 os.kill(proc.pid, signal.SIGKILL)
32                 os.waitpid(-1, os.WNOHANG)
33                 program_log.debug("%d seconds timeout" % timeout)
34@@ -183,7 +184,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
35     program_log.debug("Return code: %d", proc.returncode)
36     return (proc.returncode, proc.stdout.read())
37
38-def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False):
39+def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False, timeout=10):
40     if env_prune is None:
41         env_prune = []
42
43@@ -192,7 +193,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
44             os.chroot(root)
45
46     with program_log_lock:  # pylint: disable=not-context-manager
47-        program_log.info("Running... %s", " ".join(argv))
48+        if timeout != -1:
49+            program_log.info("Running... %s", " ".join(argv))
50+        else:
51+            program_log.info("Running... %s ...infinite timeout", " ".join(argv))
52
53         env = os.environ.copy()
54         env.update({"LC_ALL": "C",
55@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
56         else:
57             stderr_dir = subprocess.PIPE
58
59-        res, out = timeout_command(argv, 10,
60+        res, out = timeout_command(argv, timeout,
61                                    stdin=stdin,
62                                    stdout=subprocess.PIPE,
63                                    stderr=stderr_dir,
64--
652.7.4
66
67