From 4d642fd5d31654520fdeb3c83f197024e996fcf0 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 4 Jun 2010 10:13:31 +0000 Subject: [PATCH] amend.bbclass: don't parse same amend.inc if FILESPATH references it multiple times Signed-off-by: Denys Dmytriyenko Acked-by: Chris Larson --- classes/amend.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/classes/amend.bbclass b/classes/amend.bbclass index cddd28caea..fb67b4ebb1 100644 --- a/classes/amend.bbclass +++ b/classes/amend.bbclass @@ -21,7 +21,13 @@ python () { depends = d.getVar("__depends", 0) or [] d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)]) + # Make sure we don't parse the same amend.inc file more than once, if + # there are duplicates in FILESPATH + seen = set() + for file in amendfiles: if os.path.exists(file): - bb.parse.handle(file, d, 1) + if file not in seen: + bb.parse.handle(file, d, 1) + seen.add(file) } -- 2.39.5