From 68c8b7fafcfdee50aa9b18b479e2cabffa2ba61d Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Sat, 24 Feb 2018 12:27:35 +0000 Subject: [PATCH] restore.py: sort into three tiers in _templates_first() --- qubesadmin/backup/restore.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qubesadmin/backup/restore.py b/qubesadmin/backup/restore.py index 2db7101..003c88c 100644 --- a/qubesadmin/backup/restore.py +++ b/qubesadmin/backup/restore.py @@ -1664,18 +1664,19 @@ class BackupRestore(object): @staticmethod def _templates_first(vms): - '''Sort templates befor other VM types (AppVM etc)''' + '''Sort templates before other VM types''' def key_function(instance): '''Key function for :py:func:`sorted`''' if isinstance(instance, BackupVM): - return instance.klass == 'TemplateVM' + if instance.klass == 'TemplateVM': + return 0 + elif instance.properties.get('template_for_dispvms', False): + return 1 + return 2 elif hasattr(instance, 'vm'): return key_function(instance.vm) - return 0 - return sorted(vms, - key=key_function, - reverse=True) - + return 9 + return sorted(vms, key=key_function) def _handle_dom0(self, stream): '''Extract dom0 home'''