]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
Revert "cooker: now that we use a Pool, raise the exceptions"
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 6 Mar 2013 15:31:49 +0000 (15:31 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 6 Mar 2013 15:31:49 +0000 (15:31 +0000)
Reverting the pool changes, terminate does not work reliably on
bb.compat.Pool :(

This reverts commit 9ca8e513dc142dd7aefadeb6db2ccdb00f38b39f.

lib/bb/cooker.py

index 1b84e86bd7b0db6f1f2f41ebd0031dff9bca5ef8..9f7121fefcf376082fcf12e74de90cbf8604e697 100644 (file)
@@ -1563,12 +1563,12 @@ def parse_file((filename, appends, caches_array)):
         tb = sys.exc_info()[2]
         exc.recipe = filename
         exc.traceback = list(bb.exceptions.extract_traceback(tb, context=3))
-        raise
+        return True, exc
     # Need to turn BaseExceptions into Exceptions here so we gracefully shutdown
     # and for example a worker thread doesn't just exit on its own in response to
     # a SystemExit event for example.
     except BaseException as exc:
-        raise ParsingFailure(exc, filename)
+        return True, ParsingFailure(exc, filename)
 
 class CookerParser(object):
     def __init__(self, cooker, filelist, masked):