summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-09 12:33:29 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:31 +0100
commit87f62d7c8d386df0d613da4f48c0b210902ab621 (patch)
treebfa71505321276841f07bf875e479b272547b9f3 /bitbake
parentac170b0c346184bd8ba2fe1d56ccb9ea003b1a40 (diff)
downloadpoky-87f62d7c8d386df0d613da4f48c0b210902ab621.tar.gz
Ensure we always utilize the correct messaging domains
(Bitbake rev: 92a2e2e90981c0615171abe03645a772d84f6986) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cache.py2
-rw-r--r--bitbake/lib/bb/cooker.py10
-rw-r--r--bitbake/lib/bb/fetch/perforce.py6
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py2
-rw-r--r--bitbake/lib/bb/runqueue.py2
-rw-r--r--bitbake/lib/bb/utils.py6
6 files changed, 14 insertions, 14 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 30857864dc..106621911b 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -353,7 +353,7 @@ class Cache:
353 pe = self.getVar('PE', file_name, True) or "0" 353 pe = self.getVar('PE', file_name, True) or "0"
354 pv = self.getVar('PV', file_name, True) 354 pv = self.getVar('PV', file_name, True)
355 if 'SRCREVINACTION' in pv: 355 if 'SRCREVINACTION' in pv:
356 bb.note("Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name)) 356 bb.msg.note(1, bb.msg.domain.Cache, "Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name))
357 pr = self.getVar('PR', file_name, True) 357 pr = self.getVar('PR', file_name, True)
358 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") 358 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
359 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "") 359 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 f49e76d04a..a413c8a854 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -121,11 +121,11 @@ class BBCooker:
121 self.commandlineAction = None 121 self.commandlineAction = None
122 122
123 if 'world' in self.configuration.pkgs_to_build: 123 if 'world' in self.configuration.pkgs_to_build:
124 bb.error("'world' is not a valid target for --environment.") 124 bb.msg.error(bb.msg.domain.Build, "'world' is not a valid target for --environment.")
125 elif len(self.configuration.pkgs_to_build) > 1: 125 elif len(self.configuration.pkgs_to_build) > 1:
126 bb.error("Only one target can be used with the --environment option.") 126 bb.msg.error(bb.msg.domain.Build, "Only one target can be used with the --environment option.")
127 elif self.configuration.buildfile and len(self.configuration.pkgs_to_build) > 0: 127 elif self.configuration.buildfile and len(self.configuration.pkgs_to_build) > 0:
128 bb.error("No target should be used with the --environment and --buildfile options.") 128 bb.msg.error(bb.msg.domain.Build, "No target should be used with the --environment and --buildfile options.")
129 elif len(self.configuration.pkgs_to_build) > 0: 129 elif len(self.configuration.pkgs_to_build) > 0:
130 self.commandlineAction = ["showEnvironmentTarget", self.configuration.pkgs_to_build] 130 self.commandlineAction = ["showEnvironmentTarget", self.configuration.pkgs_to_build]
131 else: 131 else:
@@ -146,13 +146,13 @@ class BBCooker:
146 self.commandlineAction = ["generateDotGraph", self.configuration.pkgs_to_build, self.configuration.cmd] 146 self.commandlineAction = ["generateDotGraph", self.configuration.pkgs_to_build, self.configuration.cmd]
147 else: 147 else:
148 self.commandlineAction = None 148 self.commandlineAction = None
149 bb.error("Please specify a package name for dependency graph generation.") 149 bb.msg.error(bb.msg.domain.Build, "Please specify a package name for dependency graph generation.")
150 else: 150 else:
151 if self.configuration.pkgs_to_build: 151 if self.configuration.pkgs_to_build:
152 self.commandlineAction = ["buildTargets", self.configuration.pkgs_to_build, self.configuration.cmd] 152 self.commandlineAction = ["buildTargets", self.configuration.pkgs_to_build, self.configuration.cmd]
153 else: 153 else:
154 self.commandlineAction = None 154 self.commandlineAction = None
155 bb.error("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") 155 bb.msg.error(bb.msg.domain.Build, "Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")
156 156
157 def runCommands(self, server, data, abort): 157 def runCommands(self, server, data, abort):
158 """ 158 """
diff --git a/bitbake/lib/bb/fetch/perforce.py b/bitbake/lib/bb/fetch/perforce.py
index e2c3421089..8bc3205c2a 100644
--- a/bitbake/lib/bb/fetch/perforce.py
+++ b/bitbake/lib/bb/fetch/perforce.py
@@ -160,7 +160,7 @@ class Perforce(Fetch):
160 tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false") 160 tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false")
161 tmpfile = tmppipe.readline().strip() 161 tmpfile = tmppipe.readline().strip()
162 if not tmpfile: 162 if not tmpfile:
163 bb.error("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.") 163 bb.msg.error(bb.msg.domain.Fetcher, "Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.")
164 raise FetchError(module) 164 raise FetchError(module)
165 165
166 if "label" in parm: 166 if "label" in parm:
@@ -175,7 +175,7 @@ class Perforce(Fetch):
175 p4file = os.popen("%s%s files %s" % (p4cmd, p4opt, depot)) 175 p4file = os.popen("%s%s files %s" % (p4cmd, p4opt, depot))
176 176
177 if not p4file: 177 if not p4file:
178 bb.error("Fetch: unable to get the P4 files from %s" % (depot)) 178 bb.msg.error(bb.msg.domain.Fetcher, "Fetch: unable to get the P4 files from %s" % (depot))
179 raise FetchError(module) 179 raise FetchError(module)
180 180
181 count = 0 181 count = 0
@@ -193,7 +193,7 @@ class Perforce(Fetch):
193 count = count + 1 193 count = count + 1
194 194
195 if count == 0: 195 if count == 0:
196 bb.error("Fetch: No files gathered from the P4 fetch") 196 bb.msg.error(bb.msg.domain.Fetcher, "Fetch: No files gathered from the P4 fetch")
197 raise FetchError(module) 197 raise FetchError(module)
198 198
199 myret = os.system("tar -czf %s %s" % (ud.localpath, module)) 199 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 f4f85de245..6baf94554c 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):
39 topdir = os.getcwd() 39 topdir = os.getcwd()
40 bb.data.setVar('TOPDIR', topdir, data) 40 bb.data.setVar('TOPDIR', topdir, data)
41 if not bb.data.getVar('BBPATH', data): 41 if not bb.data.getVar('BBPATH', data):
42 bb.fatal("The BBPATH environment variable must be set") 42 bb.msg.fatal(bb.msg.domain.Parsing, "The BBPATH environment variable must be set")
43 43
44 44
45def supports(fn, d): 45def supports(fn, d):
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index c5f4380c86..9a368b8622 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -774,7 +774,7 @@ class RunQueue:
774 #print "Not current: %s" % notcurrent 774 #print "Not current: %s" % notcurrent
775 775
776 if len(unchecked) > 0: 776 if len(unchecked) > 0:
777 bb.fatal("check_stamps fatal internal error") 777 bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error")
778 return current 778 return current
779 779
780 def check_stamp_task(self, task): 780 def check_stamp_task(self, task):
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index dce80b6342..83304e4a01 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -536,7 +536,7 @@ def filter_environment(good_vars):
536 del os.environ[key] 536 del os.environ[key]
537 537
538 if len(removed_vars): 538 if len(removed_vars):
539 bb.debug(1, "Removed the following variables from the environment:", ",".join(removed_vars)) 539 bb.msg.debug(1, bb.msg.domain.Util, "Removed the following variables from the environment:", ",".join(removed_vars))
540 540
541 return removed_vars 541 return removed_vars
542 542
@@ -602,10 +602,10 @@ def mkdirhier(dir):
602 directory already exists like os.makedirs 602 directory already exists like os.makedirs
603 """ 603 """
604 604
605 bb.debug(3, "mkdirhier(%s)" % dir) 605 bb.msg.debug(3, bb.msg.domain.Util, "mkdirhier(%s)" % dir)
606 try: 606 try:
607 os.makedirs(dir) 607 os.makedirs(dir)
608 bb.debug(2, "created " + dir) 608 bb.msg.debug(2, bb.msg.domain.Util, "created " + dir)
609 except OSError, e: 609 except OSError, e:
610 if e.errno != 17: raise e 610 if e.errno != 17: raise e
611 611