From 37683ef86e48f30074394de86ed5a080e9e5d74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 12:43:34 +0100 Subject: oeqa/utils/ftools: improve remove_from_file algorithm The algorithm was sub-optimal so replace it with something more elegant. (From OE-Core rev: 6119a90173f9222efa6df25aacf873af85d64bcd) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/ftools.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'meta/lib/oeqa/utils/ftools.py') diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py index 1bd9a30a40..a7233d4ca6 100644 --- a/meta/lib/oeqa/utils/ftools.py +++ b/meta/lib/oeqa/utils/ftools.py @@ -36,10 +36,11 @@ def remove_from_file(path, data): return else: raise - lines = rdata.splitlines() - rmdata = data.strip().splitlines() - for l in rmdata: - for c in range(0, lines.count(l)): - i = lines.index(l) - del(lines[i]) - write_file(path, "\n".join(lines)) + + contents = rdata.strip().splitlines() + for r in data.strip().splitlines(): + try: + contents.remove(r) + except ValueError: + pass + write_file(path, "\n".join(contents)) -- cgit v1.2.3-54-g00ecf