diff options
| author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2015-10-19 21:38:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-21 22:56:06 +0100 |
| commit | cf311a770e50ea73cefa2a2c53616500411aa4ac (patch) | |
| tree | 030f44617037759ef787ad814f6b5459957832b3 | |
| parent | 900639c1b29cfca777ba78da1c413eb71c392978 (diff) | |
| download | poky-cf311a770e50ea73cefa2a2c53616500411aa4ac.tar.gz | |
oeqa/utils/ftools: From functions that expect data, check if None
ftools functions that expect data may get 'None'; this patch does this check
and return immediately if this is the case.
(From OE-Core rev: 5eaa4fa30e2362e6dd572b8a6f7a909b608e14bf)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/utils/ftools.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py index 1ec8a0948f..1bd9a30a40 100644 --- a/meta/lib/oeqa/utils/ftools.py +++ b/meta/lib/oeqa/utils/ftools.py | |||
| @@ -3,11 +3,17 @@ import re | |||
| 3 | import errno | 3 | import errno |
| 4 | 4 | ||
| 5 | def write_file(path, data): | 5 | def write_file(path, data): |
| 6 | # In case data is None, return immediately | ||
| 7 | if data is None: | ||
| 8 | return | ||
| 6 | wdata = data.rstrip() + "\n" | 9 | wdata = data.rstrip() + "\n" |
| 7 | with open(path, "w") as f: | 10 | with open(path, "w") as f: |
| 8 | f.write(wdata) | 11 | f.write(wdata) |
| 9 | 12 | ||
| 10 | def append_file(path, data): | 13 | def append_file(path, data): |
| 14 | # In case data is None, return immediately | ||
| 15 | if data is None: | ||
| 16 | return | ||
| 11 | wdata = data.rstrip() + "\n" | 17 | wdata = data.rstrip() + "\n" |
| 12 | with open(path, "a") as f: | 18 | with open(path, "a") as f: |
| 13 | f.write(wdata) | 19 | f.write(wdata) |
| @@ -19,6 +25,9 @@ def read_file(path): | |||
| 19 | return data | 25 | return data |
| 20 | 26 | ||
| 21 | def remove_from_file(path, data): | 27 | def remove_from_file(path, data): |
| 28 | # In case data is None, return immediately | ||
| 29 | if data is None: | ||
| 30 | return | ||
| 22 | try: | 31 | try: |
| 23 | rdata = read_file(path) | 32 | rdata = read_file(path) |
| 24 | except IOError as e: | 33 | except IOError as e: |
