From 060d23d825996a626b2cd59dca1364cb83ccc9dc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Aug 2011 17:29:09 +0100 Subject: [PATCH] Fixup remaining bb.msg.domain users (Bitbake rev: d5abdacaf9ac604ef8d8c1bafb9b30617827cb4f) Signed-off-by: Richard Purdie --- bitbake/lib/bb/msg.py | 2 +- bitbake/lib/bb/runqueue.py | 20 ++++++++++---------- bitbake/lib/bb/taskdata.py | 4 ++-- bitbake/lib/bb/ui/ncurses.py | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py index ecf756e..b7ae761 100644 --- a/bitbake/lib/bb/msg.py +++ b/bitbake/lib/bb/msg.py @@ -136,7 +136,7 @@ def addDefaultlogFilter(handler): def fatal(msgdomain, msg): if msgdomain: - logger = logging.getLogger("BitBake.%s" % msgdomin) + logger = logging.getLogger("BitBake.%s" % msgdomain) else: logger = logging.getLogger("BitBake") logger.critical(msg) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index e1d32b7..5a4321f 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -362,7 +362,7 @@ class RunQueueData: message = "\n" for msg in msgs: message = message + msg - bb.msg.fatal(bb.msg.domain.RunQueue, message) + bb.msg.fatal("RunQueue", message) return weight @@ -470,7 +470,7 @@ class RunQueueData: dep = taskData.fn_index[depdata] taskid = taskData.gettask_id(dep, idependtask, False) if taskid is None: - bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s in %s depends upon nonexistant task %s in %s" % (taskData.tasks_name[task], fn, idependtask, dep)) + bb.msg.fatal("RunQueue", "Task %s in %s depends upon nonexistant task %s in %s" % (taskData.tasks_name[task], fn, idependtask, dep)) depends.append(taskid) if depdata != fnid: tdepends_fnid[fnid].add(taskid) @@ -587,7 +587,7 @@ class RunQueueData: continue if target[1] not in taskData.tasks_lookup[fnid]: - bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s does not exist for target %s" % (target[1], target[0])) + bb.msg.fatal("RunQueue", "Task %s does not exist for target %s" % (target[1], target[0])) listid = taskData.tasks_lookup[fnid][target[1]] @@ -619,9 +619,9 @@ class RunQueueData: # Check to make sure we still have tasks to run if len(self.runq_fnid) == 0: if not taskData.abort: - bb.msg.fatal(bb.msg.domain.RunQueue, "All buildable tasks have been run but the build is incomplete (--continue mode). Errors for the tasks that failed will have been printed above.") + bb.msg.fatal("RunQueue", "All buildable tasks have been run but the build is incomplete (--continue mode). Errors for the tasks that failed will have been printed above.") else: - bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.") + bb.msg.fatal("RunQueue", "No active tasks and not in --continue mode?! Please report this bug.") logger.verbose("Pruned %s inactive tasks, %s left", delcount, len(self.runq_fnid)) @@ -632,7 +632,7 @@ class RunQueueData: origdeps = self.runq_depends[listid] for origdep in origdeps: if maps[origdep] == -1: - bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping - Should never happen!") + bb.msg.fatal("RunQueue", "Invalid mapping - Should never happen!") newdeps.append(maps[origdep]) self.runq_depends[listid] = set(newdeps) @@ -653,7 +653,7 @@ class RunQueueData: for dep in revdeps: if dep in self.runq_depends[listid]: #self.dump_data(taskData) - bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s (%s) has circular dependency on %s (%s)" % (taskData.fn_index[self.runq_fnid[dep]], self.runq_task[dep], taskData.fn_index[self.runq_fnid[listid]], self.runq_task[listid])) + bb.msg.fatal("RunQueue", "Task %s (%s) has circular dependency on %s (%s)" % (taskData.fn_index[self.runq_fnid[dep]], self.runq_task[dep], taskData.fn_index[self.runq_fnid[listid]], self.runq_task[listid])) logger.verbose("Compute totals (have %s endpoint(s))", len(endpoints)) @@ -861,7 +861,7 @@ class RunQueue: #print "Not current: %s" % notcurrent if len(unchecked) > 0: - bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error") + bb.msg.fatal("RunQueue", "check_stamps fatal internal error") return current def check_stamp_task(self, task, taskname = None): @@ -1103,7 +1103,7 @@ class RunQueueExecute: pipeout = os.fdopen(pipeout, 'wb', 0) pid = os.fork() except OSError as e: - bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror)) + bb.msg.fatal("RunQueue", "fork failed: %d (%s)" % (e.errno, e.strerror)) if pid == 0: pipein.close() @@ -1436,7 +1436,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute): deps.add(self.rqdata.runq_setscene.index(dep)) sq_revdeps_squash.append(deps) elif len(sq_revdeps_new[task]) != 0: - bb.msg.fatal(bb.msg.domain.RunQueue, "Something went badly wrong during scenequeue generation, aborting. Please report this problem.") + bb.msg.fatal("RunQueue", "Something went badly wrong during scenequeue generation, aborting. Please report this problem.") #for task in xrange(len(sq_revdeps_squash)): # print "Task %s: %s.%s is %s " % (task, self.taskData.fn_index[self.runq_fnid[self.runq_setscene[task]]], self.runq_task[self.runq_setscene[task]] + "_setscene", sq_revdeps_squash[task]) diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 79602b6..edbc860 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py @@ -153,7 +153,7 @@ class TaskData: fnid = self.getfn_id(fn) if fnid in self.failed_fnids: - bb.msg.fatal(bb.msg.domain.TaskData, "Trying to re-add a failed file? Something is broken...") + bb.msg.fatal("TaskData", "Trying to re-add a failed file? Something is broken...") # Check if we've already seen this fn if fnid in self.tasks_fnid: @@ -175,7 +175,7 @@ class TaskData: for dep in task_deps['depends'][task].split(): if dep: if ":" not in dep: - bb.msg.fatal(bb.msg.domain.TaskData, "Error, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (dep, fn)) + bb.msg.fatal("TaskData", "Error, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (dep, fn)) ids.append(((self.getbuild_id(dep.split(":")[0])), dep.split(":")[1])) self.tasks_idepends[taskid].extend(ids) diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py index 8684697..8524446 100644 --- a/bitbake/lib/bb/ui/ncurses.py +++ b/bitbake/lib/bb/ui/ncurses.py @@ -283,7 +283,7 @@ class NCursesUI: # if isinstance(event, bb.build.TaskFailed): # if event.logfile: # if data.getVar("BBINCLUDELOGS", d): -# bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile) +# bb.error("log data follows (%s)" % logfile) # number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d) # if number_of_lines: # os.system('tail -n%s %s' % (number_of_lines, logfile)) @@ -297,7 +297,7 @@ class NCursesUI: # print '| %s' % l # f.close() # else: -# bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile) +# bb.error("see log in %s" % logfile) if isinstance(event, bb.command.CommandCompleted): # stop so the user can see the result of the build, but -- 2.7.4