backup/restore: make error reporting work also for StandaloneVM based DispVM

If management dispvm is based on a StandaloneVM not a AppVM, then there
is just one level of templates, not two.

QubesOS/qubes-issues#4670
This commit is contained in:
Marek Marczykowski-Górecki 2020-08-07 02:12:39 +02:00
parent 1660a1cbf6
commit c75aeb400a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -305,7 +305,10 @@ class RestoreInDisposableVM:
raise qubesadmin.exc.QubesException( raise qubesadmin.exc.QubesException(
'qvm-backup-restore tool ' 'qvm-backup-restore tool '
'missing in {} template, install qubes-core-admin-client ' 'missing in {} template, install qubes-core-admin-client '
'package there'.format(self.dispvm.template.template.name) 'package there'.format(
getattr(self.dispvm.template,
'template',
self.dispvm.template).name)
) )
if exit_code != 0: if exit_code != 0:
raise qubesadmin.exc.BackupRestoreError( raise qubesadmin.exc.BackupRestoreError(