diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-12-09 14:05:22 -0500 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:47 +0000 |
commit | c8d2dad04960746d38d28bb2c5aba8363534541a (patch) | |
tree | 1871652c0d8d52ad23d216db0da03392b276c11d /bitbake/lib/bb/ui | |
parent | 72c6953488149f1c1fe93a1191f5aa88e6f128de (diff) | |
download | poky-c8d2dad04960746d38d28bb2c5aba8363534541a.tar.gz |
Rename the ui 'init' method to 'main'
As these may run the UI in a blocking fashion and then return the exit code,
'init' was an inappropriate name, and 'main' is more appropriate.
(Bitbake rev: 4d081a0ed759bd526ab01849d650bd9e8d80ddd1)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/depexp.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/goggle.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/ncurses.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/puccho.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py index 155a892f9f..31004db44a 100644 --- a/bitbake/lib/bb/ui/depexp.py +++ b/bitbake/lib/bb/ui/depexp.py | |||
@@ -185,7 +185,7 @@ class gtkthread(threading.Thread): | |||
185 | gtk.main() | 185 | gtk.main() |
186 | gtkthread.quit.set() | 186 | gtkthread.quit.set() |
187 | 187 | ||
188 | def init(server, eventHandler): | 188 | def main(server, eventHandler): |
189 | 189 | ||
190 | try: | 190 | try: |
191 | cmdline = server.runCommand(["getCmdLineAction"]) | 191 | cmdline = server.runCommand(["getCmdLineAction"]) |
diff --git a/bitbake/lib/bb/ui/goggle.py b/bitbake/lib/bb/ui/goggle.py index 858ca14c45..40923ba88d 100644 --- a/bitbake/lib/bb/ui/goggle.py +++ b/bitbake/lib/bb/ui/goggle.py | |||
@@ -49,7 +49,7 @@ class MainWindow (gtk.Window): | |||
49 | self.set_default_size(640, 480) | 49 | self.set_default_size(640, 480) |
50 | scrolled_window.add (self.cur_build_tv) | 50 | scrolled_window.add (self.cur_build_tv) |
51 | 51 | ||
52 | def init (server, eventHandler): | 52 | def main (server, eventHandler): |
53 | gobject.threads_init() | 53 | gobject.threads_init() |
54 | gtk.gdk.threads_init() | 54 | gtk.gdk.threads_init() |
55 | 55 | ||
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 21160bff5f..9385883ea9 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -66,7 +66,7 @@ class BBLogFormatter(logging.Formatter): | |||
66 | else: | 66 | else: |
67 | return logging.Formatter.format(self, record) | 67 | return logging.Formatter.format(self, record) |
68 | 68 | ||
69 | def init(server, eventHandler): | 69 | def main(server, eventHandler): |
70 | 70 | ||
71 | # Get values of variables which control our output | 71 | # Get values of variables which control our output |
72 | includelogs = server.runCommand(["getVariable", "BBINCLUDELOGS"]) | 72 | includelogs = server.runCommand(["getVariable", "BBINCLUDELOGS"]) |
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py index 3fed4c58a8..3bc8373964 100644 --- a/bitbake/lib/bb/ui/ncurses.py +++ b/bitbake/lib/bb/ui/ncurses.py | |||
@@ -324,7 +324,7 @@ class NCursesUI: | |||
324 | shutdown = shutdown + 1 | 324 | shutdown = shutdown + 1 |
325 | pass | 325 | pass |
326 | 326 | ||
327 | def init(server, eventHandler): | 327 | def main(server, eventHandler): |
328 | if not os.isatty(sys.stdout.fileno()): | 328 | if not os.isatty(sys.stdout.fileno()): |
329 | print("FATAL: Unable to run 'ncurses' UI without a TTY.") | 329 | print("FATAL: Unable to run 'ncurses' UI without a TTY.") |
330 | return | 330 | return |
diff --git a/bitbake/lib/bb/ui/puccho.py b/bitbake/lib/bb/ui/puccho.py index a627fc803f..3ce4590c16 100644 --- a/bitbake/lib/bb/ui/puccho.py +++ b/bitbake/lib/bb/ui/puccho.py | |||
@@ -390,7 +390,7 @@ def running_build_failed_cb (running_build, manager): | |||
390 | print("build failed") | 390 | print("build failed") |
391 | manager.notify_build_failed () | 391 | manager.notify_build_failed () |
392 | 392 | ||
393 | def init (server, eventHandler): | 393 | def main (server, eventHandler): |
394 | # Initialise threading... | 394 | # Initialise threading... |
395 | gobject.threads_init() | 395 | gobject.threads_init() |
396 | gtk.gdk.threads_init() | 396 | gtk.gdk.threads_init() |