summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2007-01-07 17:26:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2007-01-07 17:26:23 +0000
commit12f9999a2042c582197f96eb5f5fab411133e753 (patch)
tree848f06ddeb1741d2361932662eb6c131f0a4c6d5
parent1a678c62b504b2cf8b20c6fdfbf2de2c634f5d7b (diff)
downloadbitbake-12f9999a2042c582197f96eb5f5fab411133e753.tar.gz
runqueue.py: Pass cooker to prepare_runqueue (for now)
-rw-r--r--lib/bb/cooker.py4
-rw-r--r--lib/bb/runqueue.py2
-rw-r--r--lib/bb/shell.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index c02e98071..3e748f0cd 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -195,7 +195,7 @@ class BBCooker:
except bb.providers.NoProvider:
sys.exit(1)
rq = bb.runqueue.RunQueue()
- rq.prepare_runqueue(self.configuration.data, self.status, taskdata, runlist)
+ rq.prepare_runqueue(self, self.configuration.data, self.status, taskdata, runlist)
seen_fnids = []
depends_file = file('depends.dot', 'w' )
@@ -531,7 +531,7 @@ class BBCooker:
sys.exit(1)
rq = bb.runqueue.RunQueue()
- rq.prepare_runqueue(self.configuration.data, self.status, taskdata, runlist)
+ rq.prepare_runqueue(self, self.configuration.data, self.status, taskdata, runlist)
try:
failures = rq.execute_runqueue(self, self.configuration.data, self.status, taskdata, runlist)
except runqueue.TaskFailure, fnids:
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 01fa280b4..e001e12f5 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -51,7 +51,7 @@ class RunQueue:
taskname = self.runq_task[task]
return "%s, %s" % (fn, taskname)
- def prepare_runqueue(self, cfgData, dataCache, taskData, targets):
+ def prepare_runqueue(self, cooker, cfgData, dataCache, taskData, targets):
"""
Turn a set of taskData into a RunQueue and compute data needed
to optimise the execution order.
diff --git a/lib/bb/shell.py b/lib/bb/shell.py
index 2f908c213..7919145c1 100644
--- a/lib/bb/shell.py
+++ b/lib/bb/shell.py
@@ -171,7 +171,7 @@ class BitBakeShellCommands:
td.add_unresolved(cooker.configuration.data, cooker.status)
rq = runqueue.RunQueue()
- rq.prepare_runqueue(cooker.configuration.data, cooker.status, td, tasks)
+ rq.prepare_runqueue(cooker, cooker.configuration.data, cooker.status, td, tasks)
rq.execute_runqueue(cooker, cooker.configuration.data, cooker.status, td, tasks)
except Providers.NoProvider: