From 5f868b4794cbdf3c35141a8f02649d23c53bf89c Mon Sep 17 00:00:00 2001 From: jimtahu Date: Thu, 20 Sep 2018 22:21:55 -0500 Subject: [PATCH] Exclude installed_by_rpm when Restoring VM from Backup VMs listed as from an rpm when they were really from a backup lead to a missleading error message when deleting. Fixes QubesOS/qubes-issues#4192 --- qubesadmin/backup/restore.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qubesadmin/backup/restore.py b/qubesadmin/backup/restore.py index b36481b..1a2caa1 100644 --- a/qubesadmin/backup/restore.py +++ b/qubesadmin/backup/restore.py @@ -1940,6 +1940,9 @@ class BackupRestore(object): # restore options if prop in ['template', 'netvm', 'default_dispvm']: continue + # exclude as this only applied before restoring + if prop in ['installed_by_rpm']: + continue self._restore_property(new_vm, prop, value) for feature, value in vm.features.items():