summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-18 14:27:10 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-18 14:27:10 -0600
commitdee3ed396ca61c7acfab0abf4b71dfd0e818720d (patch)
treed2ecfeb4206e0f14bda93ce76bd53440118ae4ce /src
parentc617a6c6fe162605fa23017814670a6c267dd896 (diff)
downloadbcfg2-dee3ed396ca61c7acfab0abf4b71dfd0e818720d.tar.gz
bcfg2-dee3ed396ca61c7acfab0abf4b71dfd0e818720d.tar.bz2
bcfg2-dee3ed396ca61c7acfab0abf4b71dfd0e818720d.zip
fixed error message from incomplete entry on client
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Client/Tools/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index c916f980f..c0dd60c1e 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -396,12 +396,11 @@ class Tool(object):
missing = self.missing_attrs(entry)
if missing:
if action is None:
- msg = "%s: %s is missing required attribute(s): %s"
+ desc = "%s is" % self.primarykey(entry)
else:
- msg = "%%s: Cannot %s %%s due to missing required " + \
- "attribute(s): %%s" % action
- self.logger.error(msg % (self.name, self.primarykey(entry),
- ", ".join(missing)))
+ desc = "Cannot %s %s due to" % (action, self.primarykey(entry))
+ self.logger.error("%s: %s missing required attribute(s): %s" %
+ (self.name, desc, ", ".join(missing)))
return False
return True