From 527a7b561b9e38933f30869fca0bf46e4af979d4 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 4 Aug 2008 18:42:19 +0000 Subject: Fix empty plugin list core tb git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4849 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Core.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index de2e1a0ba..92602808d 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -230,10 +230,13 @@ class Core(object): chk_plugins = self.plugins.values() while True: - plugin = chk_plugins.pop() - if isinstance(plugin, Bcfg2.Server.Plugin.MetadataPlugin): - self.metadata = plugin - break + try: + plugin = chk_plugins.pop() + if isinstance(plugin, Bcfg2.Server.Plugin.MetadataPlugin): + self.metadata = plugin + break + except: + pass if not chk_plugins: self.init_plugins("Metadata") self.metadata = self.plugins["Metadata"] @@ -241,10 +244,13 @@ class Core(object): chk_plugins = self.plugins.values() while True: - plugin = chk_plugins.pop() - if isinstance(plugin, Bcfg2.Server.Plugin.StatisticsPlugin): - self.stats = plugin - break + try: + plugin = chk_plugins.pop() + if isinstance(plugin, Bcfg2.Server.Plugin.StatisticsPlugin): + self.stats = plugin + break + except: + pass if not chk_plugins: self.init_plugins("Statistics") self.stats = self.plugins["Statistics"] -- cgit v1.2.3-1-g7c22