api/admin: gracefuly report cancelled backup operation

QubesOS/qubes-issues#2931
2017-07-21 03:10:26 +02:00 · 2017-07-21 03:10:26 +02:00 · 82918ee704
commit 82918ee704
parent 088c838ac3
1 changed files with 2 additions and 0 deletions
--- a/qubes/api/admin.py
+++ b/qubes/api/admin.py
@ -1209,6 +1209,8 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
        self.app.api_admin_running_backups[self.arg] = backup_task
        try:
            yield from backup_task
+        except asyncio.CancelledError:
+            raise qubes.exc.QubesException('Backup cancelled')
        finally:
            del self.app.api_admin_running_backups[self.arg]