summaryrefslogtreecommitdiff
path: root/bitbake-dev/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-23 19:42:04 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-23 19:42:04 +0100
commit255f45be57b2209f81ee513ebc43ce7f808c2f2b (patch)
tree10ffb4df6bb4129a45c81101b08a57171feff6f9 /bitbake-dev/lib/bb
parente912493614c8e19b2b9a668e172d8ad6ea4d0091 (diff)
downloadopenembedded-core-255f45be57b2209f81ee513ebc43ce7f808c2f2b.tar.gz
openembedded-core-255f45be57b2209f81ee513ebc43ce7f808c2f2b.tar.bz2
openembedded-core-255f45be57b2209f81ee513ebc43ce7f808c2f2b.tar.xz
openembedded-core-255f45be57b2209f81ee513ebc43ce7f808c2f2b.zip
bitbake-dev: Improve showEnvironment functionality
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev/lib/bb')
-rw-r--r--bitbake-dev/lib/bb/command.py15
-rw-r--r--bitbake-dev/lib/bb/cooker.py4
2 files changed, 15 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/command.py b/bitbake-dev/lib/bb/command.py
index 8667736fa..4cab78e43 100644
--- a/bitbake-dev/lib/bb/command.py
+++ b/bitbake-dev/lib/bb/command.py
@@ -203,16 +203,25 @@ class CommandsAsync:
command.finishAsyncCommand()
showVersions.needcache = True
- def showEnvironment(self, command, params):
+ def showEnvironmentPackage(self, command, params):
"""
- Print the environment
+ Print the environment of a recipe
"""
bfile = params[0]
pkg = params[1]
command.cooker.showEnvironment(bfile, pkg)
command.finishAsyncCommand()
- showEnvironment.needcache = True
+ showEnvironmentPackage.needcache = True
+
+ def showEnvironment(self, command, params):
+ """
+ Print the standard environment
+ """
+
+ command.cooker.showEnvironment()
+ command.finishAsyncCommand()
+ showEnvironment.needcache = False
def parseFiles(self, command, params):
"""
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index 3c232a6ac..dceebb12d 100644
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -141,8 +141,10 @@ class BBCooker:
bb.error("Only one target can be used with the --environment option.")
elif self.configuration.buildfile and len(self.configuration.pkgs_to_build) > 0:
bb.error("No target should be used with the --environment and --buildfile options.")
+ elif self.configuration.buildfile is not None or len(self.configuration.pkgs_to_build) > 0:
+ self.commandlineAction = ["showEnvironmentPackage", self.configuration.buildfile, self.configuration.pkgs_to_build]
else:
- self.commandlineAction = ["showEnvironment", self.configuration.buildfile, self.configuration.pkgs_to_build]
+ self.commandlineAction = ["showEnvironment"]
elif self.configuration.buildfile is not None:
self.commandlineAction = ["buildFile", self.configuration.buildfile, self.configuration.cmd]
elif self.configuration.show_versions: