backup/restore: do not fail the whole restore when qvm-appmenus is missing

Fixes QubesOS/qubes-issues#2991
This commit is contained in:
Marek Marczykowski-Górecki 2017-08-30 16:00:00 +02:00
parent 6568d624cc
commit f98ea4a520
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -1697,7 +1697,7 @@ class BackupRestore(object):
subprocess.check_call(
['qvm-appmenus', '--set-whitelist=-', vm.name],
stdin=stream)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
self.log.error('Failed to set application list for %s', vm.name)
def _handle_volume_data(self, vm, volume, stream):