summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-12-28 17:06:58 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-12-28 17:06:58 +0000
commit86a53b02af0a7acb2b2067ad723d37747be46d13 (patch)
treed1e959bcb855ceea3e5b8d5f53c6d709603d5c84 /src
parente0ddad1c9fd59c52db3ad69177bb69eaaaf42999 (diff)
downloadbcfg2-86a53b02af0a7acb2b2067ad723d37747be46d13.tar.gz
bcfg2-86a53b02af0a7acb2b2067ad723d37747be46d13.tar.bz2
bcfg2-86a53b02af0a7acb2b2067ad723d37747be46d13.zip
Fix error upon client metadata resolution errors (Reported by Pedro)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2614 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Core.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index d6d17a708..3642ed083 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -6,6 +6,7 @@ from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError
from Bcfg2.Server.Statistics import Statistics
import logging, lxml.etree, os, stat, ConfigParser
+import Bcfg2.Server.Plugins.Metadata
logger = logging.getLogger('Bcfg2.Core')
@@ -291,7 +292,7 @@ class Core(object):
config = lxml.etree.Element("Configuration", version='2.0', revision=self.revision)
try:
meta = self.metadata.get_metadata(client)
- except Bcfg2.Server.Metadata.MetadataConsistencyError:
+ except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError:
logger.error("Metadata consistency error for client %s" % client)
return lxml.etree.Element("error", type='metadata error')