[oe-commits] Denys Dmytriyenko : amend.bbclass: don't parse same amend. inc if FILESPATH references it multiple times
git version control
git at git.openembedded.org
Fri Jun 4 20:23:19 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4d642fd5d31654520fdeb3c83f197024e996fcf0
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4d642fd5d31654520fdeb3c83f197024e996fcf0
Author: Denys Dmytriyenko <denis at denix.org>
Date: Fri Jun 4 10:13:31 2010 +0000
amend.bbclass: don't parse same amend.inc if FILESPATH references it multiple times
Signed-off-by: Denys Dmytriyenko <denis at denix.org>
Acked-by: Chris Larson <chris_larson at mentor.com>
---
classes/amend.bbclass | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/classes/amend.bbclass b/classes/amend.bbclass
index cddd28c..fb67b4e 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)
}
More information about the Openembedded-commits
mailing list