summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/parse/parse_py/BBHandler.py6
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 34f01ffc5..9a94c07bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,7 @@ Changes in Bitbake 1.9.x:
do_taskname[cleandirs] = "dir"
- bzr fetcher tweaks from Robert Schuster (#2913)
- Add mercurial (hg) fetcher from Robert Schuster (#2913)
+ - Don't add duplicates to BBPATH
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py
index cd4a1872d..a4b408f4d 100644
--- a/lib/bb/parse/parse_py/BBHandler.py
+++ b/lib/bb/parse/parse_py/BBHandler.py
@@ -118,8 +118,10 @@ def handle(fn, d, include = 0):
abs_fn = fn
if ext != ".bbclass":
- bbpath.insert(0, os.path.dirname(abs_fn))
- data.setVar('BBPATH', ":".join(bbpath), d)
+ dname = os.path.dirname(abs_fn)
+ if dname not in bbpath:
+ bbpath.insert(0, dname)
+ data.setVar('BBPATH', ":".join(bbpath), d)
if include:
bb.parse.mark_dependency(d, abs_fn)