diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-03-24 16:56:12 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
commit | 7acc132cac873e60005516272473a55a8160b9c4 (patch) | |
tree | 2e4122862ffd856803160b6089fcb979d3efd630 /bitbake/lib/bb/taskdata.py | |
parent | bbf83fd988ca3cf9dae7d2b542a11a7c942b1702 (diff) | |
download | poky-7acc132cac873e60005516272473a55a8160b9c4.tar.gz |
Formatting cleanups
(Bitbake rev: 2caf134b43a44dad30af4fbe33033b3c58deee57)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/taskdata.py')
-rw-r--r-- | bitbake/lib/bb/taskdata.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 3e5e006f5f..58e0d9d8f2 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py | |||
@@ -84,7 +84,7 @@ class TaskData: | |||
84 | 84 | ||
85 | def getrun_id(self, name): | 85 | def getrun_id(self, name): |
86 | """ | 86 | """ |
87 | Return an ID number for the run target name. | 87 | Return an ID number for the run target name. |
88 | If it doesn't exist, create one. | 88 | If it doesn't exist, create one. |
89 | """ | 89 | """ |
90 | if not name in self.run_names_index: | 90 | if not name in self.run_names_index: |
@@ -95,7 +95,7 @@ class TaskData: | |||
95 | 95 | ||
96 | def getfn_id(self, name): | 96 | def getfn_id(self, name): |
97 | """ | 97 | """ |
98 | Return an ID number for the filename. | 98 | Return an ID number for the filename. |
99 | If it doesn't exist, create one. | 99 | If it doesn't exist, create one. |
100 | """ | 100 | """ |
101 | if not name in self.fn_index: | 101 | if not name in self.fn_index: |
@@ -271,7 +271,7 @@ class TaskData: | |||
271 | 271 | ||
272 | def get_unresolved_build_targets(self, dataCache): | 272 | def get_unresolved_build_targets(self, dataCache): |
273 | """ | 273 | """ |
274 | Return a list of build targets who's providers | 274 | Return a list of build targets who's providers |
275 | are unknown. | 275 | are unknown. |
276 | """ | 276 | """ |
277 | unresolved = [] | 277 | unresolved = [] |
@@ -286,7 +286,7 @@ class TaskData: | |||
286 | 286 | ||
287 | def get_unresolved_run_targets(self, dataCache): | 287 | def get_unresolved_run_targets(self, dataCache): |
288 | """ | 288 | """ |
289 | Return a list of runtime targets who's providers | 289 | Return a list of runtime targets who's providers |
290 | are unknown. | 290 | are unknown. |
291 | """ | 291 | """ |
292 | unresolved = [] | 292 | unresolved = [] |
@@ -304,7 +304,7 @@ class TaskData: | |||
304 | Return a list of providers of item | 304 | Return a list of providers of item |
305 | """ | 305 | """ |
306 | targetid = self.getbuild_id(item) | 306 | targetid = self.getbuild_id(item) |
307 | 307 | ||
308 | return self.build_targets[targetid] | 308 | return self.build_targets[targetid] |
309 | 309 | ||
310 | def get_dependees(self, itemid): | 310 | def get_dependees(self, itemid): |
@@ -367,7 +367,7 @@ class TaskData: | |||
367 | def add_provider_internal(self, cfgData, dataCache, item): | 367 | def add_provider_internal(self, cfgData, dataCache, item): |
368 | """ | 368 | """ |
369 | Add the providers of item to the task data | 369 | Add the providers of item to the task data |
370 | Mark entries were specifically added externally as against dependencies | 370 | Mark entries were specifically added externally as against dependencies |
371 | added internally during dependency resolution | 371 | added internally during dependency resolution |
372 | """ | 372 | """ |
373 | 373 | ||
@@ -450,7 +450,7 @@ class TaskData: | |||
450 | providers_list.append(dataCache.pkg_fn[fn]) | 450 | providers_list.append(dataCache.pkg_fn[fn]) |
451 | bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (%s);" % (item, ", ".join(providers_list))) | 451 | bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (%s);" % (item, ", ".join(providers_list))) |
452 | bb.msg.note(2, bb.msg.domain.Provider, "consider defining a PREFERRED_PROVIDER entry to match runtime %s" % item) | 452 | bb.msg.note(2, bb.msg.domain.Provider, "consider defining a PREFERRED_PROVIDER entry to match runtime %s" % item) |
453 | bb.event.fire(bb.event.MultipleProviders(item,providers_list, runtime=True), cfgData) | 453 | bb.event.fire(bb.event.MultipleProviders(item, providers_list, runtime=True), cfgData) |
454 | self.consider_msgs_cache.append(item) | 454 | self.consider_msgs_cache.append(item) |
455 | 455 | ||
456 | if numberPreferred > 1: | 456 | if numberPreferred > 1: |
@@ -460,7 +460,7 @@ class TaskData: | |||
460 | providers_list.append(dataCache.pkg_fn[fn]) | 460 | providers_list.append(dataCache.pkg_fn[fn]) |
461 | bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (top %s entries preferred) (%s);" % (item, numberPreferred, ", ".join(providers_list))) | 461 | bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (top %s entries preferred) (%s);" % (item, numberPreferred, ", ".join(providers_list))) |
462 | bb.msg.note(2, bb.msg.domain.Provider, "consider defining only one PREFERRED_PROVIDER entry to match runtime %s" % item) | 462 | bb.msg.note(2, bb.msg.domain.Provider, "consider defining only one PREFERRED_PROVIDER entry to match runtime %s" % item) |
463 | bb.event.fire(bb.event.MultipleProviders(item,providers_list, runtime=True), cfgData) | 463 | bb.event.fire(bb.event.MultipleProviders(item, providers_list, runtime=True), cfgData) |
464 | self.consider_msgs_cache.append(item) | 464 | self.consider_msgs_cache.append(item) |
465 | 465 | ||
466 | # run through the list until we find one that we can build | 466 | # run through the list until we find one that we can build |
@@ -594,9 +594,9 @@ class TaskData: | |||
594 | bb.msg.debug(3, bb.msg.domain.TaskData, "tasks:") | 594 | bb.msg.debug(3, bb.msg.domain.TaskData, "tasks:") |
595 | for task in range(len(self.tasks_name)): | 595 | for task in range(len(self.tasks_name)): |
596 | bb.msg.debug(3, bb.msg.domain.TaskData, " (%s)%s - %s: %s" % ( | 596 | bb.msg.debug(3, bb.msg.domain.TaskData, " (%s)%s - %s: %s" % ( |
597 | task, | 597 | task, |
598 | self.fn_index[self.tasks_fnid[task]], | 598 | self.fn_index[self.tasks_fnid[task]], |
599 | self.tasks_name[task], | 599 | self.tasks_name[task], |
600 | self.tasks_tdepends[task])) | 600 | self.tasks_tdepends[task])) |
601 | 601 | ||
602 | bb.msg.debug(3, bb.msg.domain.TaskData, "dependency ids (per fn):") | 602 | bb.msg.debug(3, bb.msg.domain.TaskData, "dependency ids (per fn):") |
@@ -606,5 +606,3 @@ class TaskData: | |||
606 | bb.msg.debug(3, bb.msg.domain.TaskData, "runtime dependency ids (per fn):") | 606 | bb.msg.debug(3, bb.msg.domain.TaskData, "runtime dependency ids (per fn):") |
607 | for fnid in self.rdepids: | 607 | for fnid in self.rdepids: |
608 | bb.msg.debug(3, bb.msg.domain.TaskData, " %s %s: %s" % (fnid, self.fn_index[fnid], self.rdepids[fnid])) | 608 | bb.msg.debug(3, bb.msg.domain.TaskData, " %s %s: %s" % (fnid, self.fn_index[fnid], self.rdepids[fnid])) |
609 | |||
610 | |||