summaryrefslogtreecommitdiff
path: root/src/buildstream/_messenger.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/buildstream/_messenger.py')
-rw-r--r--src/buildstream/_messenger.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/buildstream/_messenger.py b/src/buildstream/_messenger.py
index f5f570319..20c327728 100644
--- a/src/buildstream/_messenger.py
+++ b/src/buildstream/_messenger.py
@@ -405,6 +405,13 @@ class Messenger():
#
del state['_render_status_cb']
+ # The "simple_task" context manager is not needed outside the main
+ # process. During testing we override it to something that cannot
+ # pickle, so just drop it when pickling to a child job. Note that it
+ # will only appear in 'state' if it has been overridden.
+ #
+ state.pop('simple_task', None)
+
# The State object is not needed outside the main process
del state['_state']