summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch')
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch
index ecb95039d..9c5d53b43 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch
@@ -1,4 +1,4 @@
1From b30a74671ca603e6bfd514f72d4fd7fd6fceef54 Mon Sep 17 00:00:00 2001 1From f783b9b00da5df176fcd7927b752f574ca6db319 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 26 Aug 2016 02:02:49 -0400 3Date: Fri, 26 Aug 2016 02:02:49 -0400
4Subject: [PATCH 05/11] fix incorrect timeout while system time changed 4Subject: [PATCH 05/11] fix incorrect timeout while system time changed
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22 1 file changed, 3 insertions(+), 3 deletions(-) 22 1 file changed, 3 insertions(+), 3 deletions(-)
23 23
24diff --git a/blivet/util.py b/blivet/util.py 24diff --git a/blivet/util.py b/blivet/util.py
25index d6804be..bc08af5 100644 25index 7e89949..5571e73 100644
26--- a/blivet/util.py 26--- a/blivet/util.py
27+++ b/blivet/util.py 27+++ b/blivet/util.py
28@@ -162,14 +162,14 @@ def timeout_command(argv, timeout, *args, **kwargs): 28@@ -163,14 +163,14 @@ def timeout_command(argv, timeout, *args, **kwargs):
29 """call shell-command and either return its output or kill it 29 """call shell-command and either return its output or kill it
30 if it doesn't normally exit within timeout seconds and return None""" 30 if it doesn't normally exit within timeout seconds and return None"""
31 import subprocess, datetime, os, time, signal 31 import subprocess, datetime, os, time, signal