Repository: cloudstack Updated Branches: refs/heads/master 9f4f9211d -> bb1c70b3d
Test if config specifies a zone before using it Signed-off-by: Santhosh Edukulla <santhosh.eduku...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb1c70b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb1c70b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb1c70b3 Branch: refs/heads/master Commit: bb1c70b3d8eedde6dfa2cb992ebd1e9f6ed1cdab Parents: 9f4f921 Author: miguelaferreira <miguelferre...@me.com> Authored: Wed Jul 23 13:50:47 2014 +0200 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Wed Jul 23 20:30:33 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/marvinInit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb1c70b3/tools/marvin/marvin/marvinInit.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/marvinInit.py b/tools/marvin/marvin/marvinInit.py index ce9b43f..56ea509 100644 --- a/tools/marvin/marvin/marvinInit.py +++ b/tools/marvin/marvin/marvinInit.py @@ -111,7 +111,7 @@ class MarvinInit: if not self.__hypervisorType: self.__hypervisorType = XEN_SERVER if not self.__zoneForTests: - if self.__parsedConfig: + if self.__parsedConfig and self.__parsedConfig.zones is not None: for zone in self.__parsedConfig.zones: self.__zoneForTests = zone.name break
