Improve interrupt handling and send signal to current loop

Closes QubesOS/qubes-issues#9410

qubesbuilder/cli/cli_base.py

@@ -20,7 +20,8 @@
 """
 QubesBuilder command-line interface - base module.
 """
-
+import asyncio
+import signal
 import sys
 import traceback
 from typing import Callable, List
@@ -61,21 +62,38 @@ def __init__(self, *args, **kwargs):
         self.list_commands = self.list_commands_for_help  # type: ignore
 
     def __call__(self, *args, **kwargs):
+        loop = asyncio.get_event_loop()
+
+        def _handle_interrupt():
+            tasks = asyncio.all_tasks(loop)
+            for task in tasks:
+                task.cancel()
+
+        loop.add_signal_handler(signal.SIGINT, _handle_interrupt)
+
+        # default return code
+        rc = 0
+
         try:
-            return self.main(*args, **kwargs)
+            self.main(*args, standalone_mode=False, **kwargs)
         except Exception as exc:
-            QubesBuilderLogger.error(f"An error occurred: {str(exc)}")
-            if self.debug is True:
-                formatted_traceback = "".join(traceback.format_exception(exc))
-                QubesBuilderLogger.error(
-                    "\n" + formatted_traceback.rstrip("\n")
-                )
-
-            if isinstance(exc, click.ClickException):
-                # pylint: disable=no-member
-                sys.exit(exc.exit_code)
+            rc = 1
+            if isinstance(exc, click.Abort) or "Signals.SIGINT" in str(exc):
+                QubesBuilderLogger.warning(f"Interrupting...")
             else:
-                sys.exit(1)
+                QubesBuilderLogger.error(f"An error occurred: {str(exc)}")
+                if self.debug is True:
+                    formatted_traceback = "".join(
+                        traceback.format_exception(exc)
+                    )
+                    QubesBuilderLogger.error(
+                        "\n" + formatted_traceback.rstrip("\n")
+                    )
+                if isinstance(exc, click.ClickException):
+                    # pylint: disable=no-member
+                    rc = exc.exit_code
+        finally:
+            sys.exit(rc)
 
     def get_command(self, ctx, cmd_name):
         rv = click.Group.get_command(self, ctx, cmd_name)

qubesbuilder/executors/qubes.py

@@ -371,7 +371,7 @@ def run(  # type: ignore
                         )
                         continue
                     raise e
-        except ExecutorError as e:
+        except (subprocess.CalledProcessError, ExecutorError) as e:
             if dispvm and self._clean_on_error:
                 self.cleanup(dispvm)
             raise e