[buildstream] branch abderrahim/blocking-activity created (now 9fc98416a)

[ak...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

akitouni pushed a change to branch abderrahim/blocking-activity
in repository https://gitbox.apache.org/repos/asf/buildstream.git


      at 9fc98416a plugin: don't try to pickle the exceptions thrown by blocking_activity

This branch includes the following new commits:

     new 9fc98416a plugin: don't try to pickle the exceptions thrown by blocking_activity

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[buildstream] 01/01: plugin: don't try to pickle the exceptions thrown by blocking_activity

[ak...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

akitouni pushed a commit to branch abderrahim/blocking-activity
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 9fc98416a9942e8d8ffed85ec05dd982a119c6ee
Author: Abderrahim Kitouni <ak...@gnome.org>
AuthorDate: Mon Jan 16 21:19:54 2023 +0100

    plugin: don't try to pickle the exceptions thrown by blocking_activity
---
 src/buildstream/plugin.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/buildstream/plugin.py b/src/buildstream/plugin.py
index e1e7b1fb6..1773d314e 100644
--- a/src/buildstream/plugin.py
+++ b/src/buildstream/plugin.py
@@ -123,7 +123,6 @@ import multiprocessing.synchronize
 import multiprocessing.popen_forkserver  # type: ignore
 
 import os
-import pickle
 import queue
 import signal
 import subprocess
@@ -184,13 +183,8 @@ def _background_job_wrapper(result_queue: multiprocessing.Queue, target: Callabl
     try:
         result = target(*args)
         result_queue.put((None, result))
-    except Exception as exc:  # pylint: disable=broad-except
-        try:
-            # Here we send the result again, just in case it was a PickleError
-            # in which case the same exception would be thrown down
-            result_queue.put((exc, result))
-        except pickle.PickleError:
-            result_queue.put((traceback.format_exc(), None))
+    except Exception:  # pylint: disable=broad-except
+        result_queue.put((traceback.format_exc(), None))
 
 
 class Plugin: