Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug2986'

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-08-30 17:33:32 +02:00
commit 3c9e5f6630
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubesadmin/backup/restore.py
View File

@ -869,6 +869,7 @@ class BackupRestore(object):
tar1_command = ['tar', tar1_command = ['tar',
'-ixv', '-ixv',
'--occurrence=1',
'-C', self.tmpdir] + filelist '-C', self.tmpdir] + filelist
tar1_env = os.environ.copy() tar1_env = os.environ.copy()
@ -1696,7 +1697,7 @@ class BackupRestore(object):
subprocess.check_call( subprocess.check_call(
['qvm-appmenus', '--set-whitelist=-', vm.name], ['qvm-appmenus', '--set-whitelist=-', vm.name],
stdin=stream) stdin=stream)
except subprocess.CalledProcessError: except (subprocess.CalledProcessError, FileNotFoundError):
self.log.error('Failed to set application list for %s', vm.name) self.log.error('Failed to set application list for %s', vm.name)
def _handle_volume_data(self, vm, volume, stream): def _handle_volume_data(self, vm, volume, stream):