From d7862266d6bbab8dac3ca6d9941bc118d42325cd Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 30 Apr 2013 08:14:50 +1000 Subject: [PATCH] DOC: missing cinfo tags are ok. Log error for self referencing definitions --- server/action.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/action.py b/server/action.py index 22a96fa2..c2f1455b 100644 --- a/server/action.py +++ b/server/action.py @@ -145,6 +145,7 @@ class Action: def execActionStart(self): if self.__cInfo: if not Action.substituteRecursiveTags(self.__cInfo): + logSys.error("Cinfo/definitions contain self referencing definitions and cannot be resolved") return False startCmd = Action.replaceTag(self.__actionStart, self.__cInfo) return Action.executeCmd(startCmd) @@ -268,7 +269,9 @@ class Action: value = value[0:m.start()] + tags[m.group(1)] + value[m.end():] m = t.search(value, m.start()) else: - # TODO missing tag? to abort or not? there is the case maybe + # Missing tags are ok so we just continue on searching. + # cInfo can contain aInfo elements like and valid shell + # constructs like . m = t.search(value, m.start() + 1) tags[tag] = value return tags