From dee3ed396ca61c7acfab0abf4b71dfd0e818720d Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 18 Dec 2012 14:27:10 -0600 Subject: fixed error message from incomplete entry on client --- src/lib/Bcfg2/Client/Tools/__init__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') 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 -- cgit v1.2.3-1-g7c22