diff options
Diffstat (limited to 'bitbake-dev/lib')
| -rw-r--r-- | bitbake-dev/lib/bb/command.py | 15 | ||||
| -rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 4 |
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: |