]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
cooker: Shut down the parser in error state
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 8 Jan 2015 09:41:03 +0000 (09:41 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 8 Jan 2015 09:42:15 +0000 (09:42 +0000)
If the cooker is in an error state, we shouldn't continue to try parsing.
This fixes an issue where an invalid PR server is detected when bitbake
is started and ensures bitbake exits cleanly rather than hanging.

[YOCTO #6934]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/cooker.py

index 0d9b85e604aef75add3e9d7bb908fad2b03f9c13..23e7abda39ec425ed4e98c0f04927511d7bf04ee 100644 (file)
@@ -1355,7 +1355,7 @@ class BBCooker:
         if self.state == state.running:
             return
 
-        if self.state in (state.shutdown, state.forceshutdown):
+        if self.state in (state.shutdown, state.forceshutdown, state.error):
             if hasattr(self.parser, 'shutdown'):
                 self.parser.shutdown(clean=False, force = True)
             raise bb.BBHandledException()