diff options
| author | Jeff Dike <jdike@linux.intel.com> | 2010-06-29 13:32:04 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-29 13:32:04 +0100 |
| commit | f9d7e9e3be89ac9141fb0eb7c71eef5a9a82add9 (patch) | |
| tree | 1ee1ed9eb7673f1556da0d52d14089a03d93f76f /bitbake/lib | |
| parent | 132122e31375117bf8b5ab68369cb8fafa03058d (diff) | |
| download | poky-f9d7e9e3be89ac9141fb0eb7c71eef5a9a82add9.tar.gz | |
bitbake: Move the logger initialization from cooker to utils
In order to move the environment cleaning, which wants to log a
message, before cooker creation, the logging facility initialization
needs to happen earlier. So, it is now in init_logger in utils.py and
called from bitbake before the creation of the data object.
It also seems more correct to initialize a global facility like this
from a more global context than the creation of an object, of which
there could theoretically be many.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 11 | ||||
| -rw-r--r-- | bitbake/lib/bb/utils.py | 16 |
2 files changed, 16 insertions, 11 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 3881df484a..2406dfe95b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -72,17 +72,6 @@ class BBCooker: | |||
| 72 | 72 | ||
| 73 | self.configuration = configuration | 73 | self.configuration = configuration |
| 74 | 74 | ||
| 75 | if self.configuration.verbose: | ||
| 76 | bb.msg.set_verbose(True) | ||
| 77 | |||
| 78 | if self.configuration.debug: | ||
| 79 | bb.msg.set_debug_level(self.configuration.debug) | ||
| 80 | else: | ||
| 81 | bb.msg.set_debug_level(0) | ||
| 82 | |||
| 83 | if self.configuration.debug_domains: | ||
| 84 | bb.msg.set_debug_domains(self.configuration.debug_domains) | ||
| 85 | |||
| 86 | self.configuration.data = bb.data.init() | 75 | self.configuration.data = bb.data.init() |
| 87 | 76 | ||
| 88 | bb.data.inheritFromOS(self.configuration.data) | 77 | bb.data.inheritFromOS(self.configuration.data) |
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index ad0aa68b27..40326f98d2 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
| @@ -614,3 +614,19 @@ def which(path, item, direction = 0): | |||
| 614 | return next | 614 | return next |
| 615 | 615 | ||
| 616 | return "" | 616 | return "" |
| 617 | |||
| 618 | def init_logger(logger, verbose, debug, debug_domains): | ||
| 619 | """ | ||
| 620 | Set verbosity and debug levels in the logger | ||
| 621 | """ | ||
| 622 | |||
| 623 | if verbose: | ||
| 624 | logger.set_verbose(True) | ||
| 625 | |||
| 626 | if debug: | ||
| 627 | logger.set_debug_level(debug) | ||
| 628 | else: | ||
| 629 | logger.set_debug_level(0) | ||
| 630 | |||
| 631 | if debug_domains: | ||
| 632 | logger.set_debug_domains(debug_domains) | ||
