From 25c425920c700f93ddcb4971704fe2936c817ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 8 Jan 2015 03:56:45 +0100 Subject: [PATCH] qvm-tools: fix error reporting in qvm-kill --- qvm-tools/qvm-kill | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qvm-tools/qvm-kill b/qvm-tools/qvm-kill index 8d364ca3..d3a08871 100755 --- a/qvm-tools/qvm-kill +++ b/qvm-tools/qvm-kill @@ -21,8 +21,8 @@ # # -from qubes.qubes import QubesVmCollection -from optparse import OptionParser; +from qubes.qubes import QubesVmCollection,QubesException +from optparse import OptionParser import subprocess import sys @@ -48,7 +48,7 @@ def main(): try: vm.force_shutdown() - except (IOError, OSError) as err: + except (IOError, OSError, QubesException) as err: print >> sys.stderr, "ERROR: {0}".format(err) exit (1)