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

qvm-backup-restore: really pass options

Browse Source
This commit is contained in:
Rusty Bird 2018-02-23 02:09:04 +00:00
parent a0d6327532
commit 2d8bade8b2
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesadmin/tests/tools/qvm_backup_restore.py
View File

@ -93,7 +93,7 @@ class TC_00_qvm_backup_restore(qubesadmin.tests.QubesTestCase):
app=self.app) app=self.app)
mock_backup.assert_called_once_with( mock_backup.assert_called_once_with(
self.app, '/some/path', None, 'testpass') self.app, '/some/path', None, 'testpass')
self.assertEqual(exclude_list, ['test-vm2']) self.assertEqual(mock_backup.return_value.options.exclude, ['test-vm2'])
self.assertAllCalled() self.assertAllCalled()
def test_010_handle_broken_no_problems(self): def test_010_handle_broken_no_problems(self):

18
qubesadmin/tools/qvm_backup_restore.py
View File

@ -223,18 +223,12 @@ def main(args=None, app=None):
if args.ignore_missing: if args.ignore_missing:
backup.options.use_default_template = True backup.options.use_default_template = True
backup.options.use_default_netvm = True backup.options.use_default_netvm = True
if args.rename_conflicting: backup.options.rename_conflicting = args.rename_conflicting
backup.options.rename_conflicting = True backup.options.dom0_home = args.dom0_home
if not args.dom0_home: backup.options.ignore_username_mismatch = args.ignore_username_mismatch
backup.options.dom0_home = False backup.options.ignore_size_limit = args.ignore_size_limit
if args.ignore_username_mismatch: backup.options.exclude = args.exclude
backup.options.ignore_username_mismatch = True backup.options.verify_only = args.verify_only
if args.ignore_size_limit:
backup.options.ignore_size_limit = True
if args.exclude:
backup.options.exclude = args.exclude
if args.verify_only:
backup.options.verify_only = True
restore_info = None restore_info = None
try: try: