From 1136f9e02d9cbe2c2cda189321d72b763649ba42 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Mon, 19 Oct 2015 21:38:42 +0000 Subject: oeqa/utils/ftools: Ignore the exception if file does not exist There may be cases where the configuration file (path) does not exist, thus the remove_from_file should catch this exception. In case the exception is not the latter (errno.ENOENT), then re-raise it. [YOCTO #8540] Signed-off-by: Leonardo Sandoval Signed-off-by: Ross Burton --- meta/lib/oeqa/utils/ftools.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py index 64ebe3d217..1ec8a0948f 100644 --- a/meta/lib/oeqa/utils/ftools.py +++ b/meta/lib/oeqa/utils/ftools.py @@ -1,5 +1,6 @@ import os import re +import errno def write_file(path, data): wdata = data.rstrip() + "\n" @@ -18,7 +19,15 @@ def read_file(path): return data def remove_from_file(path, data): - lines = read_file(path).splitlines() + try: + rdata = read_file(path) + except IOError as e: + # if file does not exit, just quit, otherwise raise an exception + if e.errno == errno.ENOENT: + return + else: + raise + lines = rdata.splitlines() rmdata = data.strip().splitlines() for l in rmdata: for c in range(0, lines.count(l)): -- cgit 1.2.3-korg