diff options
| author |   Denys Dmytriyenko <denis@denix.org> | 2010-06-04 10:13:31 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2010-06-04 16:22:55 -0400 |
| commit | 4d642fd5d31654520fdeb3c83f197024e996fcf0 (patch) | |
| tree | ae49a771607df29d164bcd06cd8455827c4c9caa /classes | |
| parent | 793e0d81c9932c9e9b98d9bad8be968eb3d7022c (diff) | |
| download | openembedded-4d642fd5d31654520fdeb3c83f197024e996fcf0.tar.gz | |
amend.bbclass: don't parse same amend.inc if FILESPATH references it multiple times
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/amend.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
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) } |