From 913cc25ed82b9965094f2f91971e69190ed9ef74 Mon Sep 17 00:00:00 2001 From: Adeodato Simo <dato@google.com> Date: Thu, 2 Dec 2010 15:01:57 +0000 Subject: [PATCH] config.py: replace "node group" with "nodegroup" Though code uses "nodegroup" as data member name, strings that will be read by the user should use "node group" (with a space), since "nodegroup" is not a word. Signed-off-by: Adeodato Simo <dato@google.com> Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Iustin Pop <iustin@google.com> --- lib/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/config.py b/lib/config.py index a903e18f6..dc373b118 100644 --- a/lib/config.py +++ b/lib/config.py @@ -477,13 +477,13 @@ class ConfigWriter: for nodegroup_uuid in data.nodegroups: nodegroup = data.nodegroups[nodegroup_uuid] if nodegroup.uuid != nodegroup_uuid: - result.append("nodegroup '%s' (uuid: '%s') indexed by wrong uuid '%s'" + result.append("node group '%s' (uuid: '%s') indexed by wrong uuid '%s'" % (nodegroup.name, nodegroup.uuid, nodegroup_uuid)) if utils.UUID_RE.match(nodegroup.name.lower()): - result.append("nodegroup '%s' (uuid: '%s') has uuid-like name" % + result.append("node group '%s' (uuid: '%s') has uuid-like name" % (nodegroup.name, nodegroup.uuid)) if nodegroup.name in nodegroups_names: - result.append("duplicate nodegroup name '%s'" % nodegroup.name) + result.append("duplicate node group name '%s'" % nodegroup.name) else: nodegroups_names.add(nodegroup.name) @@ -877,7 +877,7 @@ class ConfigWriter: """ if target is None: if len(self._config_data.nodegroups) != 1: - raise errors.OpPrereqError("More than one nodegroup exists. Target" + raise errors.OpPrereqError("More than one node group exists. Target" " group must be specified explicitely.") else: return self._config_data.nodegroups.keys()[0] @@ -886,7 +886,7 @@ class ConfigWriter: for nodegroup in self._config_data.nodegroups.values(): if nodegroup.name == target: return nodegroup.uuid - raise errors.OpPrereqError("Nodegroup '%s' not found" % target) + raise errors.OpPrereqError("Node group '%s' not found" % target) def _UnlockedGetNodeGroup(self, uuid): """Lookup a node group. -- GitLab