diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 7034f1d718..4b2e5bf917 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -61,7 +61,7 @@ class CollectionError(bb.BBHandledException): | |||
61 | """ | 61 | """ |
62 | 62 | ||
63 | class state: | 63 | class state: |
64 | initial, parsing, running, shutdown, stop = range(5) | 64 | initial, parsing, running, shutdown, forceshutdown, stopped = range(6) |
65 | 65 | ||
66 | 66 | ||
67 | class SkippedPackage: | 67 | class SkippedPackage: |
@@ -1044,7 +1044,7 @@ class BBCooker: | |||
1044 | 1044 | ||
1045 | def buildFileIdle(server, rq, abort): | 1045 | def buildFileIdle(server, rq, abort): |
1046 | 1046 | ||
1047 | if abort or self.state == state.stop: | 1047 | if abort or self.state == state.forceshutdown: |
1048 | rq.finish_runqueue(True) | 1048 | rq.finish_runqueue(True) |
1049 | elif self.state == state.shutdown: | 1049 | elif self.state == state.shutdown: |
1050 | rq.finish_runqueue(False) | 1050 | rq.finish_runqueue(False) |
@@ -1081,7 +1081,7 @@ class BBCooker: | |||
1081 | targets = self.checkPackages(targets) | 1081 | targets = self.checkPackages(targets) |
1082 | 1082 | ||
1083 | def buildTargetsIdle(server, rq, abort): | 1083 | def buildTargetsIdle(server, rq, abort): |
1084 | if abort or self.state == state.stop: | 1084 | if abort or self.state == state.forceshutdown: |
1085 | rq.finish_runqueue(True) | 1085 | rq.finish_runqueue(True) |
1086 | elif self.state == state.shutdown: | 1086 | elif self.state == state.shutdown: |
1087 | rq.finish_runqueue(False) | 1087 | rq.finish_runqueue(False) |
@@ -1170,7 +1170,7 @@ class BBCooker: | |||
1170 | if self.state == state.running: | 1170 | if self.state == state.running: |
1171 | return | 1171 | return |
1172 | 1172 | ||
1173 | if self.state in (state.shutdown, state.stop): | 1173 | if self.state in (state.shutdown, state.forceshutdown): |
1174 | self.parser.shutdown(clean=False, force = True) | 1174 | self.parser.shutdown(clean=False, force = True) |
1175 | sys.exit(1) | 1175 | sys.exit(1) |
1176 | 1176 | ||
@@ -1240,11 +1240,11 @@ class BBCooker: | |||
1240 | prserv.serv.auto_shutdown(self.data) | 1240 | prserv.serv.auto_shutdown(self.data) |
1241 | bb.event.fire(CookerExit(), self.event_data) | 1241 | bb.event.fire(CookerExit(), self.event_data) |
1242 | 1242 | ||
1243 | def shutdown(self): | 1243 | def shutdown(self, force = False): |
1244 | self.state = state.shutdown | 1244 | if force: |
1245 | 1245 | self.state = state.forceshutdown | |
1246 | def stop(self): | 1246 | else: |
1247 | self.state = state.stop | 1247 | self.state = state.shutdown |
1248 | 1248 | ||
1249 | def initialize(self): | 1249 | def initialize(self): |
1250 | self.initConfigurationData() | 1250 | self.initConfigurationData() |