diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-12-10 16:53:19 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:49 +0000 |
commit | 098f63d6727e3b4db0a8906deee52c75f03047fb (patch) | |
tree | a6937b895dc0126fa684695b15e42700f8fb3eb2 /bitbake/lib/bb/ui | |
parent | 5a92e67b8655d0971c6e3e8233e984ef9ad42997 (diff) | |
download | poky-098f63d6727e3b4db0a8906deee52c75f03047fb.tar.gz |
Rename command events, adjust compareRevisions
- Moved the logic for comparing revisions from cooker into command
- Removed 'Cooker' from the event names
- Renamed the 'ExitCode' event into CommandExit, and changed CommandFailed to
be a subclass of CommandExit
(Bitbake rev: c51ed5d7a9971fad6019dac6c35a71b8a54ab16a)
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 | 10 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 10 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/ncurses.py | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py index 31004db44a..a6039ec57d 100644 --- a/bitbake/lib/bb/ui/depexp.py +++ b/bitbake/lib/bb/ui/depexp.py | |||
@@ -21,6 +21,8 @@ import gobject | |||
21 | import gtk | 21 | import gtk |
22 | import threading | 22 | import threading |
23 | import xmlrpclib | 23 | import xmlrpclib |
24 | import bb | ||
25 | import bb.event | ||
24 | from bb.ui.crumbs.progress import ProgressBar | 26 | from bb.ui.crumbs.progress import ProgressBar |
25 | 27 | ||
26 | # Package Model | 28 | # Package Model |
@@ -236,11 +238,13 @@ def main(server, eventHandler): | |||
236 | parse(event._depgraph, dep.pkg_model, dep.depends_model) | 238 | parse(event._depgraph, dep.pkg_model, dep.depends_model) |
237 | gtk.gdk.threads_leave() | 239 | gtk.gdk.threads_leave() |
238 | 240 | ||
239 | if isinstance(event, bb.command.CookerCommandCompleted): | 241 | if isinstance(event, bb.command.CommandCompleted): |
240 | continue | 242 | continue |
241 | if isinstance(event, bb.command.CookerCommandFailed): | 243 | if isinstance(event, bb.command.CommandFailed): |
242 | print("Command execution failed: %s" % event.error) | 244 | print("Command execution failed: %s" % event.error) |
243 | break | 245 | return event.exitcode |
246 | if isinstance(event, bb.command.CommandExit): | ||
247 | return event.exitcode | ||
244 | if isinstance(event, bb.cooker.CookerExit): | 248 | if isinstance(event, bb.cooker.CookerExit): |
245 | break | 249 | break |
246 | 250 | ||
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index e0f08ecb6e..d3534a0f5b 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -163,15 +163,15 @@ def main(server, eventHandler): | |||
163 | % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors))) | 163 | % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors))) |
164 | continue | 164 | continue |
165 | 165 | ||
166 | if isinstance(event, bb.command.CookerCommandCompleted): | 166 | if isinstance(event, bb.command.CommandCompleted): |
167 | break | 167 | break |
168 | if isinstance(event, bb.command.CookerCommandSetExitCode): | 168 | if isinstance(event, bb.command.CommandFailed): |
169 | return_value = event.exitcode | 169 | return_value = event.exitcode |
170 | continue | ||
171 | if isinstance(event, bb.command.CookerCommandFailed): | ||
172 | return_value = 1 | ||
173 | logger.error("Command execution failed: %s" % event.error) | 170 | logger.error("Command execution failed: %s" % event.error) |
174 | break | 171 | break |
172 | if isinstance(event, bb.command.CommandExit): | ||
173 | return_value = event.exitcode | ||
174 | continue | ||
175 | if isinstance(event, bb.cooker.CookerExit): | 175 | if isinstance(event, bb.cooker.CookerExit): |
176 | break | 176 | break |
177 | if isinstance(event, bb.event.MultipleProviders): | 177 | if isinstance(event, bb.event.MultipleProviders): |
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py index 3bc8373964..1db4ec173b 100644 --- a/bitbake/lib/bb/ui/ncurses.py +++ b/bitbake/lib/bb/ui/ncurses.py | |||
@@ -288,12 +288,14 @@ class NCursesUI: | |||
288 | # else: | 288 | # else: |
289 | # bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile) | 289 | # bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile) |
290 | 290 | ||
291 | if isinstance(event, bb.command.CookerCommandCompleted): | 291 | if isinstance(event, bb.command.CommandCompleted): |
292 | exitflag = True | 292 | exitflag = True |
293 | if isinstance(event, bb.command.CookerCommandFailed): | 293 | if isinstance(event, bb.command.CommandFailed): |
294 | mw.appendText("Command execution failed: %s" % event.error) | 294 | mw.appendText("Command execution failed: %s" % event.error) |
295 | time.sleep(2) | 295 | time.sleep(2) |
296 | exitflag = True | 296 | exitflag = True |
297 | if isinstance(event, bb.command.CommandExit): | ||
298 | exitflag = True | ||
297 | if isinstance(event, bb.cooker.CookerExit): | 299 | if isinstance(event, bb.cooker.CookerExit): |
298 | exitflag = True | 300 | exitflag = True |
299 | 301 | ||