summaryrefslogtreecommitdiffstats
path: root/bitbake-dev/lib
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2008-10-28 12:06:05 +0000
committerRob Bradford <rob@linux.intel.com>2008-10-28 12:06:05 +0000
commit526d996a02cd788f025b3f79ff2935d21806f36f (patch)
tree31fe7ab370e30be6ebaed71b12f7923ad2c03900 /bitbake-dev/lib
parent0b6fdfb14d7de5d087055574beb3abfd7d9e6931 (diff)
downloadpoky-526d996a02cd788f025b3f79ff2935d21806f36f.tar.gz
bitbake-dev: Use the default task if 'None' asked for
Since the default task is not known/available until the configuration files are parsed we may return None when the UI requests getCmdLine. We can enforce the use of the default by querying it again after the configuration is parsed/cache updated.
Diffstat (limited to 'bitbake-dev/lib')
-rw-r--r--bitbake-dev/lib/bb/cooker.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index 6dde5de0f8..ead76ca6ba 100644
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -305,6 +305,10 @@ class BBCooker:
305 # Need files parsed 305 # Need files parsed
306 self.updateCache() 306 self.updateCache()
307 307
308 # If we are told to do the None task then query the default task
309 if (task == None):
310 task = self.configuration.cmd
311
308 pkgs_to_build = self.checkPackages(pkgs_to_build) 312 pkgs_to_build = self.checkPackages(pkgs_to_build)
309 313
310 localdata = data.createCopy(self.configuration.data) 314 localdata = data.createCopy(self.configuration.data)
@@ -610,6 +614,14 @@ class BBCooker:
610 Build the file matching regexp buildfile 614 Build the file matching regexp buildfile
611 """ 615 """
612 616
617 # Parse the configuration here. We need to do it explicitly here since
618 # buildFile() doesn't use the cache
619 self.parseConfiguration()
620
621 # If we are told to do the None task then query the default task
622 if (task == None):
623 task = self.configuration.cmd
624
613 fn = self.matchFile(buildfile) 625 fn = self.matchFile(buildfile)
614 self.buildSetVars() 626 self.buildSetVars()
615 627
@@ -680,6 +692,10 @@ class BBCooker:
680 # Need files parsed 692 # Need files parsed
681 self.updateCache() 693 self.updateCache()
682 694
695 # If we are told to do the NULL task then query the default task
696 if (task == None):
697 task = self.configuration.cmd
698
683 targets = self.checkPackages(targets) 699 targets = self.checkPackages(targets)
684 700
685 def buildTargetsIdle(server, rq, abort): 701 def buildTargetsIdle(server, rq, abort):