diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2018-08-01 16:27:43 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-08-02 11:23:03 -0700 |
| commit | d3ae34eec2d312410da6cc1dd1c6fb85e8259261 (patch) | |
| tree | 3f827986a0f5c4865d33b05001b2c59601208b76 /meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch | |
| parent | 78de74100807303fe304ea0f088317d2aa0be917 (diff) | |
| download | meta-openembedded-contrib-d3ae34eec2d312410da6cc1dd1c6fb85e8259261.tar.gz | |
python3-blivet: 2.2.0 -> 3.0.1
- Drop 0004-Mount-var-volatile-during-install.patch and
0005-update-fstab-by-appending.patch
which are moved to python3-anaconda 28.22.11
- Drop 0013-Revert-Adapt-to-logging-module-name-change.patch
whichis obsolete
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch')
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch index 01e71be304..fea2254074 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch @@ -1,7 +1,7 @@ -From 86744d408b91acdcb086a03d7779fcda152f2ac3 Mon Sep 17 00:00:00 2001 +From 596979ed58109141a7fee680ab95b27296c022b1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 8 May 2017 14:39:56 +0800 -Subject: [PATCH 02/13] run_program support timeout +Subject: [PATCH 02/11] run_program support timeout Upstream-Status: Pending @@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index 0cf5188..d4bd9bb 100644 +index 0f2a995..05a253c 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -158,6 +158,30 @@ class Path(str): +@@ -157,6 +157,30 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -45,7 +45,7 @@ index 0cf5188..d4bd9bb 100644 def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): if env_prune is None: -@@ -180,36 +204,22 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -179,36 +203,22 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa stderr_dir = subprocess.STDOUT else: stderr_dir = subprocess.PIPE |