summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-09 16:37:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-11 10:58:36 +0000
commit4e4f040a73ca81f830cf90af05b75e7c06f91d8d (patch)
tree757658c20d4a305195e437d94db81242acd1f26f
parent44e148d6160f1205bdafd902f8ab9771d7181b43 (diff)
downloadpoky-4e4f040a73ca81f830cf90af05b75e7c06f91d8d.tar.gz
bitbake: cooker/command: Drop async command handler indirection via cooker
Indirecting the async command handler via cooker is confusing and no longer needed. Drop it to make things slightly clearer. (Bitbake rev: 4a41a7d0594e6a84a67b9de70a505858aebcd84a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/command.py4
-rw-r--r--bitbake/lib/bb/cooker.py9
2 files changed, 2 insertions, 11 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index e6fd4fbd9e..a29e41afda 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -107,10 +107,10 @@ class Command:
107 if command not in CommandsAsync.__dict__: 107 if command not in CommandsAsync.__dict__:
108 return None, "No such command" 108 return None, "No such command"
109 self.currentAsyncCommand = (command, commandline) 109 self.currentAsyncCommand = (command, commandline)
110 self.cooker.idleCallBackRegister(self.cooker.runCommands, self.cooker) 110 self.cooker.idleCallBackRegister(self.runAsyncCommand, None)
111 return True, None 111 return True, None
112 112
113 def runAsyncCommand(self): 113 def runAsyncCommand(self, _, _2, halt):
114 try: 114 try:
115 self.cooker.process_inotify_updates_apply() 115 self.cooker.process_inotify_updates_apply()
116 if self.cooker.state in (bb.cooker.state.error, bb.cooker.state.shutdown, bb.cooker.state.forceshutdown): 116 if self.cooker.state in (bb.cooker.state.error, bb.cooker.state.shutdown, bb.cooker.state.forceshutdown):
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index d2c42c858d..13d6e9d847 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -535,15 +535,6 @@ class BBCooker:
535 logger.debug("Base environment change, triggering reparse") 535 logger.debug("Base environment change, triggering reparse")
536 self.reset() 536 self.reset()
537 537
538 def runCommands(self, server, data, halt):
539 """
540 Run any queued asynchronous command
541 This is done by the idle handler so it runs in true context rather than
542 tied to any UI.
543 """
544
545 return self.command.runAsyncCommand()
546
547 def showVersions(self): 538 def showVersions(self):
548 539
549 (latest_versions, preferred_versions, required) = self.findProviders() 540 (latest_versions, preferred_versions, required) = self.findProviders()