[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2768/8267] bitbake: toaster: fix handling of EnvironmentError



commit c7b55ea170aa6e87ec38cb09677f2611170cbe68
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue Sep 27 16:16:54 2016 +0100

    bitbake: toaster: fix handling of EnvironmentError
    
    Due to the bug in processing EnvironmentError exception,
    toasterui ignores it. As EnvironmentError is a base for OSError
    and IOError this means that all OSError and IOError exceptions
    were silently ignored.
    
    (Bitbake rev: c8f4ca008bf9396b0ed45d44bfe2220c82a614a9)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Michael Wood <michael g wood intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/ui/toasterui.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index b5422cf..569957a 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -450,9 +450,12 @@ def main(server, eventHandler, params):
             return_value += 1
 
         except EnvironmentError as ioerror:
-            # ignore interrupted io
-            if ioerror.args[0] == 4:
-                pass
+            logger.warning("EnvironmentError: %s" % ioerror)
+            # ignore interrupted io system calls
+            if ioerror.args[0] == 4: # errno 4 is EINTR
+                logger.warning("Skipped EINTR: %s" % ioerror)
+            else:
+                raise
         except KeyboardInterrupt:
             if params.observe_only:
                 print("\nKeyboard Interrupt, exiting observer...")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]