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

backup: make pylint happy

Browse Source 
Use 'vm_info' instead of restore_info['dom0'], as it is available inside
the loop. And break some lines to not exceed 80 chars..
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-22 17:23:27 +01:00
parent c2281fefc8
commit 796a3d43ae
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubesadmin/backup/restore.py
View File

@ -1742,10 +1742,12 @@ class BackupRestore(object):
if vm and vm_info.subdir: if vm and vm_info.subdir:
if isinstance(vm_info, self.Dom0ToRestore) and \ if isinstance(vm_info, self.Dom0ToRestore) and \
vm_info.good_to_go: vm_info.good_to_go:
vms_dirs.append(os.path.dirname(restore_info['dom0'].subdir)) vms_dirs.append(os.path.dirname(vm_info.subdir))
vms_size += int(restore_info['dom0'].size) vms_size += int(vm_info.size)
if not self.options.verify_only: if self.options.verify_only:
handlers[restore_info['dom0'].subdir] = (self._handle_dom0, None) continue
handlers[vm_info.subdir] = (self._handle_dom0, None)
else: else:
vms_size += int(vm_info.size) vms_size += int(vm_info.size)
vms_dirs.append(vm_info.subdir) vms_dirs.append(vm_info.subdir)
@ -1760,10 +1762,11 @@ class BackupRestore(object):
self._handle_volume_data, vm, volume) self._handle_volume_data, vm, volume)
size_func = functools.partial( size_func = functools.partial(
self._handle_volume_size, vm, volume) self._handle_volume_size, vm, volume)
handlers[os.path.join(vm_info.subdir, name + '.img')] = \ img_path = os.path.join(vm_info.subdir, name + '.img')
(data_func, size_func) handlers[img_path] = (data_func, size_func)
handlers[os.path.join(vm_info.subdir, 'firewall.xml')] = ( handlers[os.path.join(vm_info.subdir, 'firewall.xml')] = (
functools.partial(vm_info.vm.handle_firewall_xml, vm), None) functools.partial(vm_info.vm.handle_firewall_xml, vm),
None)
handlers[os.path.join(vm_info.subdir, handlers[os.path.join(vm_info.subdir,
'whitelisted-appmenus.list')] = ( 'whitelisted-appmenus.list')] = (
functools.partial(self._handle_appmenus_list, vm), None) functools.partial(self._handle_appmenus_list, vm), None)