Merge remote-tracking branch 'qubesos/pr/56'

* qubesos/pr/56:
  qvm-backup-restore: also handle absent --ignore-missing
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-27 02:32:37 +01:00
commit 090cccd468
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -220,9 +220,8 @@ def main(args=None, app=None):
# unreachable - error_runtime will raise SystemExit # unreachable - error_runtime will raise SystemExit
return 1 return 1
if args.ignore_missing: backup.options.use_default_template = args.ignore_missing
backup.options.use_default_template = True backup.options.use_default_netvm = args.ignore_missing
backup.options.use_default_netvm = True
backup.options.rename_conflicting = args.rename_conflicting backup.options.rename_conflicting = args.rename_conflicting
backup.options.dom0_home = args.dom0_home backup.options.dom0_home = args.dom0_home
backup.options.ignore_username_mismatch = args.ignore_username_mismatch backup.options.ignore_username_mismatch = args.ignore_username_mismatch