diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 524ba1182c..3295f6c822 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -1109,10 +1109,13 @@ class BBCooker: | |||
| 1109 | 1109 | ||
| 1110 | def buildFileIdle(server, rq, abort): | 1110 | def buildFileIdle(server, rq, abort): |
| 1111 | 1111 | ||
| 1112 | msg = None | ||
| 1112 | if abort or self.state == state.forceshutdown: | 1113 | if abort or self.state == state.forceshutdown: |
| 1113 | rq.finish_runqueue(True) | 1114 | rq.finish_runqueue(True) |
| 1115 | msg = "Forced shutdown" | ||
| 1114 | elif self.state == state.shutdown: | 1116 | elif self.state == state.shutdown: |
| 1115 | rq.finish_runqueue(False) | 1117 | rq.finish_runqueue(False) |
| 1118 | msg = "Stopped build" | ||
| 1116 | failures = 0 | 1119 | failures = 0 |
| 1117 | try: | 1120 | try: |
| 1118 | retval = rq.execute_runqueue() | 1121 | retval = rq.execute_runqueue() |
| @@ -1125,7 +1128,7 @@ class BBCooker: | |||
| 1125 | 1128 | ||
| 1126 | if not retval: | 1129 | if not retval: |
| 1127 | bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, failures), self.event_data) | 1130 | bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, failures), self.event_data) |
| 1128 | self.command.finishAsyncCommand() | 1131 | self.command.finishAsyncCommand(msg) |
| 1129 | return False | 1132 | return False |
| 1130 | if retval is True: | 1133 | if retval is True: |
| 1131 | return True | 1134 | return True |
| @@ -1139,10 +1142,13 @@ class BBCooker: | |||
| 1139 | """ | 1142 | """ |
| 1140 | 1143 | ||
| 1141 | def buildTargetsIdle(server, rq, abort): | 1144 | def buildTargetsIdle(server, rq, abort): |
| 1145 | msg = None | ||
| 1142 | if abort or self.state == state.forceshutdown: | 1146 | if abort or self.state == state.forceshutdown: |
| 1143 | rq.finish_runqueue(True) | 1147 | rq.finish_runqueue(True) |
| 1148 | msg = "Forced shutdown" | ||
| 1144 | elif self.state == state.shutdown: | 1149 | elif self.state == state.shutdown: |
| 1145 | rq.finish_runqueue(False) | 1150 | rq.finish_runqueue(False) |
| 1151 | msg = "Stopped build" | ||
| 1146 | failures = 0 | 1152 | failures = 0 |
| 1147 | try: | 1153 | try: |
| 1148 | retval = rq.execute_runqueue() | 1154 | retval = rq.execute_runqueue() |
| @@ -1155,7 +1161,7 @@ class BBCooker: | |||
| 1155 | 1161 | ||
| 1156 | if not retval: | 1162 | if not retval: |
| 1157 | bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, failures), self.data) | 1163 | bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, failures), self.data) |
| 1158 | self.command.finishAsyncCommand() | 1164 | self.command.finishAsyncCommand(msg) |
| 1159 | return False | 1165 | return False |
| 1160 | if retval is True: | 1166 | if retval is True: |
| 1161 | return True | 1167 | return True |