cooker: Allow featureset in error state

PATCH New Richard Purdie 1 participant 1 message Nov 27, 2014

Share & tools

Richard Purdie

author

2014-11-27 14:59 UTC #0 lore raw

PATCH 1/1 cooker: Allow featureset in error state

Currently, if an invalid PR service is selected the server will error with a traceback. This is because its set into the error state and the setFeature code will then fail since its not in the initial state.

Modifying the featureset in the error state is acceptable, we just need to ensure we don't trigger a reset, that would happen from whichever code handles the error.

[YOCTO #6934]

Signed-off-by Richard Purdie <[email protected]>

bitbake/lib/bb/cooker.py +2 -2

index a08c14b..df9a0ca 100644
@@ -165,13 +165,13 @@ class BBCooker:
 
     def setFeatures(self, features):
         # we only accept a new feature set if we're in state initial, so we can reset without problems
-        if self.state != state.initial:
+        if self.state != state.initial and self.state != state.error:
             raise Exception("Illegal state for feature set change")
         original_featureset = list(self.featureset)
         for feature in features:
             self.featureset.setFeature(feature)
         bb.debug(1, "Features set %s (was %s)" % (original_featureset, list(self.featureset)))
-        if (original_featureset != list(self.featureset)):
+        if (original_featureset != list(self.featureset)) and self.state != state.error:
             self.reset()
 
     def initConfigurationData(self):