mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

python3-blivet: 3.0.1 -> 3.1.1

Browse Source 
Drop 0012-remove-dmraid-dependency-check.patch and
0013-add-Z-y-and-y-to-lvm.pvcreate.patch which the
new version has fixed the issues

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-11-27 16:32:38 +08:00
committed by Khem Raj
parent 2a9489ba36
commit f01d87a7e8
14 changed files with 48 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
+7 -7
View File
@@ -1,4 +1,4 @@
From 325898f3f2951bbde07da47888175c427b11ddc3 Mon Sep 17 00:00:00 2001
From 5d5436dfa3bdde7b4e87ce5a40cbc724199847d6 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 05a253c..d6804be 100644
index 4f05076..7e89949 100644
--- a/blivet/util.py
+++ b/blivet/util.py
@@ -157,6 +157,7 @@ class Path(str):
@@ -158,6 +158,7 @@ class Path(str):
def __hash__(self):
return self._path.__hash__()
@@ -22,7 +22,7 @@ index 05a253c..d6804be 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"""
@@ -168,7 +169,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
@@ -169,7 +170,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 05a253c..d6804be 100644
os.kill(proc.pid, signal.SIGKILL)
os.waitpid(-1, os.WNOHANG)
program_log.debug("%d seconds timeout" % timeout)
@@ -182,7 +183,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
@@ -183,7 +184,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 05a253c..d6804be 100644
if env_prune is None:
env_prune = []
@@ -191,7 +192,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
@@ -192,7 +193,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 05a253c..d6804be 100644
env = os.environ.copy()
env.update({"LC_ALL": "C",
@@ -204,7 +208,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
else:
stderr_dir = subprocess.PIPE