From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 30 Oct 2012 17:18:32 +0000 (+0000)
Subject: bitbake: cooker.py: Don't dump the environment into the console log file
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5acdd87bd45db9971db1af14e26751f8a3f3792;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7ca1ffdd942..e299059401c 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -239,8 +239,10 @@ class BBCooker:
                 self.commandlineAction['msg'] = "No target should be used with the --environment and --buildfile options."
             elif len(self.configuration.pkgs_to_build) > 0:
                 self.commandlineAction['action'] = ["showEnvironmentTarget", self.configuration.pkgs_to_build]
+                self.configuration.data.setVar("BB_CONSOLELOG", None)
             else:
                 self.commandlineAction['action'] = ["showEnvironment", self.configuration.buildfile]
+                self.configuration.data.setVar("BB_CONSOLELOG", None)
         elif self.configuration.buildfile is not None:
             self.commandlineAction['action'] = ["buildFile", self.configuration.buildfile, self.configuration.cmd]
         elif self.configuration.revisions_changed: