[OE-core] [PATCH 2/2] oeqa/utils/ftools: From functions that expect data, check if None
leonardo.sandoval.gonzalez at linux.intel.com
leonardo.sandoval.gonzalez at linux.intel.com
Mon Oct 19 21:38:43 UTC 2015
From: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
ftools functions that expect data may get 'None'; this patch does this check
and return immediately if this is the case.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
---
meta/lib/oeqa/utils/ftools.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py
index 1ec8a09..1bd9a30 100644
--- a/meta/lib/oeqa/utils/ftools.py
+++ b/meta/lib/oeqa/utils/ftools.py
@@ -3,11 +3,17 @@ import re
import errno
def write_file(path, data):
+ # In case data is None, return immediately
+ if data is None:
+ return
wdata = data.rstrip() + "\n"
with open(path, "w") as f:
f.write(wdata)
def append_file(path, data):
+ # In case data is None, return immediately
+ if data is None:
+ return
wdata = data.rstrip() + "\n"
with open(path, "a") as f:
f.write(wdata)
@@ -19,6 +25,9 @@ def read_file(path):
return data
def remove_from_file(path, data):
+ # In case data is None, return immediately
+ if data is None:
+ return
try:
rdata = read_file(path)
except IOError as e:
--
1.8.4.5
More information about the Openembedded-core
mailing list