From 3f8200ec08050d1747182d09c9cbf690c7135844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Thu, 9 Sep 2021 12:44:24 +0200
Subject: [PATCH] Fix too-narrow exception caught in qvm_shutdown

Instead of QubesVMNotStartedError, QubesVMNotRunningError
(which is a subclass) was being caught, which led to
unintended error raised on shutting down an
already-shut down VM.

fixes QubesOS/qubes-issues#3032
---
 qubesadmin/tools/qvm_shutdown.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qubesadmin/tools/qvm_shutdown.py b/qubesadmin/tools/qvm_shutdown.py
index fe0b68d6..db15190f 100644
--- a/qubesadmin/tools/qvm_shutdown.py
+++ b/qubesadmin/tools/qvm_shutdown.py
@@ -72,7 +72,7 @@ def main(args=None, app=None):  # pylint: disable=missing-docstring
         for vm in this_round_domains:
             try:
                 vm.shutdown(force=force)
-            except qubesadmin.exc.QubesVMNotRunningError:
+            except qubesadmin.exc.QubesVMNotStartedError:
                 pass
             except qubesadmin.exc.QubesException as e:
                 if not args.wait: