summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-30 17:18:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-01 11:46:21 +0000
commitf5acdd87bd45db9971db1af14e26751f8a3f3792 (patch)
tree6730efc8ee7bddbbf6517f5d016873e86e9a0343
parent62651064d1a61b1c5b6334a7a77952ddbdf5b639 (diff)
downloadpoky-f5acdd87bd45db9971db1af14e26751f8a3f3792.tar.gz
bitbake: cooker.py: Don't dump the environment into the console log file
Dumping the environment data into the console log files directory is invariably not what the user wants or expects and leads to confusion when looking at the log directory. This change forces the logs to be disabled by default when using the -e option. (Bitbake rev: 5d825b31d1133e41d3982db1b94f6a30a6fb99f7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7ca1ffdd94..e299059401 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -239,8 +239,10 @@ class BBCooker:
239 self.commandlineAction['msg'] = "No target should be used with the --environment and --buildfile options." 239 self.commandlineAction['msg'] = "No target should be used with the --environment and --buildfile options."
240 elif len(self.configuration.pkgs_to_build) > 0: 240 elif len(self.configuration.pkgs_to_build) > 0:
241 self.commandlineAction['action'] = ["showEnvironmentTarget", self.configuration.pkgs_to_build] 241 self.commandlineAction['action'] = ["showEnvironmentTarget", self.configuration.pkgs_to_build]
242 self.configuration.data.setVar("BB_CONSOLELOG", None)
242 else: 243 else:
243 self.commandlineAction['action'] = ["showEnvironment", self.configuration.buildfile] 244 self.commandlineAction['action'] = ["showEnvironment", self.configuration.buildfile]
245 self.configuration.data.setVar("BB_CONSOLELOG", None)
244 elif self.configuration.buildfile is not None: 246 elif self.configuration.buildfile is not None:
245 self.commandlineAction['action'] = ["buildFile", self.configuration.buildfile, self.configuration.cmd] 247 self.commandlineAction['action'] = ["buildFile", self.configuration.buildfile, self.configuration.cmd]
246 elif self.configuration.revisions_changed: 248 elif self.configuration.revisions_changed: