diff options
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/cache.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 10 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/perforce.py | 6 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/utils.py | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 30857864d..106621911 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -353,7 +353,7 @@ class Cache: pe = self.getVar('PE', file_name, True) or "0" pv = self.getVar('PV', file_name, True) if 'SRCREVINACTION' in pv: - bb.note("Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name)) + bb.msg.note(1, bb.msg.domain.Cache, "Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name)) pr = self.getVar('PR', file_name, True) dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "") diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index f49e76d04..a413c8a85 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -121,11 +121,11 @@ class BBCooker: self.commandlineAction = None if 'world' in self.configuration.pkgs_to_build: - bb.error("'world' is not a valid target for --environment.") + bb.msg.error(bb.msg.domain.Build, "'world' is not a valid target for --environment.") elif len(self.configuration.pkgs_to_build) > 1: - bb.error("Only one target can be used with the --environment option.") + bb.msg.error(bb.msg.domain.Build, "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.") + bb.msg.error(bb.msg.domain.Build, "No target should be used with the --environment and --buildfile options.") elif len(self.configuration.pkgs_to_build) > 0: self.commandlineAction = ["showEnvironmentTarget", self.configuration.pkgs_to_build] else: @@ -146,13 +146,13 @@ class BBCooker: self.commandlineAction = ["generateDotGraph", self.configuration.pkgs_to_build, self.configuration.cmd] else: self.commandlineAction = None - bb.error("Please specify a package name for dependency graph generation.") + bb.msg.error(bb.msg.domain.Build, "Please specify a package name for dependency graph generation.") else: if self.configuration.pkgs_to_build: self.commandlineAction = ["buildTargets", self.configuration.pkgs_to_build, self.configuration.cmd] else: self.commandlineAction = None - bb.error("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") + bb.msg.error(bb.msg.domain.Build, "Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") def runCommands(self, server, data, abort): """ diff --git a/bitbake/lib/bb/fetch/perforce.py b/bitbake/lib/bb/fetch/perforce.py index e2c342108..8bc3205c2 100644 --- a/bitbake/lib/bb/fetch/perforce.py +++ b/bitbake/lib/bb/fetch/perforce.py @@ -160,7 +160,7 @@ class Perforce(Fetch): tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false") tmpfile = tmppipe.readline().strip() if not tmpfile: - bb.error("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.") + bb.msg.error(bb.msg.domain.Fetcher, "Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.") raise FetchError(module) if "label" in parm: @@ -175,7 +175,7 @@ class Perforce(Fetch): p4file = os.popen("%s%s files %s" % (p4cmd, p4opt, depot)) if not p4file: - bb.error("Fetch: unable to get the P4 files from %s" % (depot)) + bb.msg.error(bb.msg.domain.Fetcher, "Fetch: unable to get the P4 files from %s" % (depot)) raise FetchError(module) count = 0 @@ -193,7 +193,7 @@ class Perforce(Fetch): count = count + 1 if count == 0: - bb.error("Fetch: No files gathered from the P4 fetch") + bb.msg.error(bb.msg.domain.Fetcher, "Fetch: No files gathered from the P4 fetch") raise FetchError(module) myret = os.system("tar -czf %s %s" % (ud.localpath, module)) diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index f4f85de24..6baf94554 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -39,7 +39,7 @@ def init(data): topdir = os.getcwd() bb.data.setVar('TOPDIR', topdir, data) if not bb.data.getVar('BBPATH', data): - bb.fatal("The BBPATH environment variable must be set") + bb.msg.fatal(bb.msg.domain.Parsing, "The BBPATH environment variable must be set") def supports(fn, d): diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index c5f4380c8..9a368b862 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -774,7 +774,7 @@ class RunQueue: #print "Not current: %s" % notcurrent if len(unchecked) > 0: - bb.fatal("check_stamps fatal internal error") + bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error") return current def check_stamp_task(self, task): diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index dce80b634..83304e4a0 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -536,7 +536,7 @@ def filter_environment(good_vars): del os.environ[key] if len(removed_vars): - bb.debug(1, "Removed the following variables from the environment:", ",".join(removed_vars)) + bb.msg.debug(1, bb.msg.domain.Util, "Removed the following variables from the environment:", ",".join(removed_vars)) return removed_vars @@ -602,10 +602,10 @@ def mkdirhier(dir): directory already exists like os.makedirs """ - bb.debug(3, "mkdirhier(%s)" % dir) + bb.msg.debug(3, bb.msg.domain.Util, "mkdirhier(%s)" % dir) try: os.makedirs(dir) - bb.debug(2, "created " + dir) + bb.msg.debug(2, bb.msg.domain.Util, "created " + dir) except OSError, e: if e.errno != 17: raise e |