Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Julien Duponchelle
2017-06-19 10:44:52 +02:00
16 changed files with 95 additions and 13 deletions

View File

@ -169,7 +169,8 @@ class VPCSVM(BaseNode):
if self.script_file:
content = self.startup_script
content = content.replace(self._name, new_name)
content = re.sub(r"^set pcname .+$", "set pcname " + new_name, content, flags=re.MULTILINE)
escaped_name = re.escape(new_name)
content = re.sub(r"^set pcname .+$", "set pcname " + escaped_name, content, flags=re.MULTILINE)
self.startup_script = content
super(VPCSVM, VPCSVM).name.__set__(self, new_name)