summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/taskdata.py8
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1955c29b0..e7e7431c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ Changes in Bitbake 1.9.x:
- Add mercurial (hg) fetcher from Robert Schuster (#2913)
- Don't add duplicates to BBPATH
- Fix preferred_version return values (providers.py)
+ - Fix 'depends' flag splitting
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/taskdata.py b/lib/bb/taskdata.py
index 902cc140e..74a8b84bd 100644
--- a/lib/bb/taskdata.py
+++ b/lib/bb/taskdata.py
@@ -149,7 +149,7 @@ class TaskData:
# Touch all intertask dependencies
if 'depends' in task_deps and task in task_deps['depends']:
ids = []
- for dep in task_deps['depends'][task].split(" "):
+ for dep in task_deps['depends'][task].split():
if dep:
ids.append(str(self.getbuild_id(dep.split(":")[0])) + ":" + dep.split(":")[1])
self.tasks_idepends[taskid].extend(ids)
@@ -559,7 +559,11 @@ class TaskData:
self.tasks_name[task],
self.tasks_tdepends[task]))
- bb.msg.debug(3, bb.msg.domain.TaskData, "runtime ids (per fn):")
+ bb.msg.debug(3, bb.msg.domain.TaskData, "dependency ids (per fn):")
+ for fnid in self.depids:
+ bb.msg.debug(3, bb.msg.domain.TaskData, " %s %s: %s" % (fnid, self.fn_index[fnid], self.depids[fnid]))
+
+ bb.msg.debug(3, bb.msg.domain.TaskData, "runtime dependency ids (per fn):")
for fnid in self.rdepids:
bb.msg.debug(3, bb.msg.domain.TaskData, " %s %s: %s" % (fnid, self.fn_index[fnid], self.rdepids[fnid]))