From 279dc78a023d2e434e21825bdaada4c5d7704d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 28 Jul 2014 01:00:56 +0200 Subject: [PATCH] core: do not reject already existing VMs with invalid name It would break the system when the rules for names change. Warn instead. --- core-modules/000QubesVm.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core-modules/000QubesVm.py b/core-modules/000QubesVm.py index 6e456e31..18f7cdd0 100644 --- a/core-modules/000QubesVm.py +++ b/core-modules/000QubesVm.py @@ -286,9 +286,12 @@ class QubesVm(object): assert self.name is not None if not self.verify_name(self.name): - raise QubesException("Invalid VM name (invalid characters, " - "over 31 chars long, or one of 'none', " - "'true', 'false')") + msg = ("'%s' is invalid VM name (invalid characters, over 31 chars long, " + "or one of 'none', 'true', 'false')") % self.name + if 'xml_element' in kwargs: + print >>sys.stderr, "WARNING: %s" % msg + else: + raise QubesException(msg) if self.netvm is not None: self.netvm.connected_vms[self.qid] = self