Merge remote-tracking branch 'qubesos/pr/202'
* qubesos/pr/202: api/admin: fix backup exclude
This commit is contained in:
commit
b66a2e9a51
@ -1347,10 +1347,10 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
|
||||
if any(qubes.utils.match_vm_name_with_special(vm, name)
|
||||
for name in include_vms))
|
||||
|
||||
# handle exclude
|
||||
vms_to_backup.difference_update(vm for vm in self.app.domains
|
||||
if any(qubes.utils.match_vm_name_with_special(vm, name)
|
||||
for name in exclude_vms))
|
||||
# handle exclude
|
||||
vms_to_exclude = set(vm.name for vm in self.app.domains
|
||||
if any(qubes.utils.match_vm_name_with_special(vm, name)
|
||||
for name in exclude_vms))
|
||||
|
||||
kwargs = {
|
||||
'target_vm': dest_vm,
|
||||
@ -1360,7 +1360,8 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
|
||||
}
|
||||
if isinstance(compression, str):
|
||||
kwargs['compression_filter'] = compression
|
||||
backup = qubes.backup.Backup(self.app, vms_to_backup, **kwargs)
|
||||
backup = qubes.backup.Backup(self.app, vms_to_backup, vms_to_exclude,
|
||||
**kwargs)
|
||||
return backup
|
||||
|
||||
def _backup_progress_callback(self, profile_name, progress):
|
||||
|
@ -2003,6 +2003,7 @@ class TC_00_VMs(AdminAPITestCase):
|
||||
mock_backup.assert_called_once_with(
|
||||
self.app,
|
||||
{self.vm},
|
||||
set(),
|
||||
target_vm=self.vm,
|
||||
target_dir='/home/user',
|
||||
compressed=True,
|
||||
@ -2038,6 +2039,7 @@ class TC_00_VMs(AdminAPITestCase):
|
||||
mock_backup.assert_called_once_with(
|
||||
self.app,
|
||||
{self.vm},
|
||||
set(),
|
||||
target_vm=self.vm,
|
||||
target_dir='/home/user',
|
||||
compressed=True,
|
||||
|
Loading…
Reference in New Issue
Block a user