From d8a354001fe00188635ad74430af602a3f5c270c Mon Sep 17 00:00:00 2001 From: Robert Gogolok Date: Fri, 23 May 2008 20:57:28 +0000 Subject: fix typos, #560 git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4631 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Admin/Compare.py | 6 +++--- src/lib/Server/Plugins/Deps.py | 2 +- src/lib/Server/Plugins/Metadata.py | 2 +- src/lib/Server/Reports/reports/templates/config_items/index.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/Server/Admin/Compare.py b/src/lib/Server/Admin/Compare.py index 8d4dda352..124c0c647 100644 --- a/src/lib/Server/Admin/Compare.py +++ b/src/lib/Server/Admin/Compare.py @@ -41,7 +41,7 @@ class Compare(Bcfg2.Server.Admin.Mode): (child.tag, child.get('name'), noattrmatch) if len(old.getchildren()) == 0 and len(new.getchildren()) == 0: return True - if new.tag == 'Independant': + if new.tag == 'Independent': name = 'Base' else: name = new.get('name') @@ -95,8 +95,8 @@ class Compare(Bcfg2.Server.Admin.Mode): else: print "Unmatched bundle %s" % (bundle.get('name')) rcs.append(False) - i1 = new.find('./Independant') - i2 = old.find('./Independant') + i1 = new.find('./Independent') + i2 = old.find('./Independent') if self.compareStructures(i1, i2): new.remove(i1) old.remove(i2) diff --git a/src/lib/Server/Plugins/Deps.py b/src/lib/Server/Plugins/Deps.py index ef1bc86ea..21ff302fe 100644 --- a/src/lib/Server/Plugins/Deps.py +++ b/src/lib/Server/Plugins/Deps.py @@ -90,7 +90,7 @@ class Deps(Bcfg2.Server.Plugin.PrioDir): prereqs.append(prq) self.cache[(entries, gdata)] = prereqs - newstruct = lxml.etree.Element("Independant") + newstruct = lxml.etree.Element("Independent") for tag, name in prereqs: try: lxml.etree.SubElement(newstruct, tag, name=name) diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 9caa7e7ae..9244bb8a0 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -222,7 +222,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin): real = self.groups.keys() for client in self.clients.keys(): if self.clients[client] not in self.profiles: - self.logger.error("Client %s set as nonexistant or incomplete group %s" \ + self.logger.error("Client %s set as nonexistent or incomplete group %s" \ % (client, self.clients[client])) self.logger.error("Removing client mapping for %s" % (client)) self.bad_clients[client] = self.clients[client] diff --git a/src/lib/Server/Reports/reports/templates/config_items/index.html b/src/lib/Server/Reports/reports/templates/config_items/index.html index 76541b38c..159ff8579 100644 --- a/src/lib/Server/Reports/reports/templates/config_items/index.html +++ b/src/lib/Server/Reports/reports/templates/config_items/index.html @@ -43,7 +43,7 @@ {% endif %}{% if item.reason.current_version %} Version: {{item.reason.current_version}}{{item.reason.version}} {% endif %}{% if not item.reason.current_exists %} -Existance: This item does not currently exist on the host but is specified to exist in the configuration. +Existence: This item does not currently exist on the host but is specified to exist in the configuration. {% endif %}{% if item.reason.current_diff %} NDiff:
{{item.reason.current_diff|syntaxhilight:"diff"}}
{% endif %} -- cgit v1.2.3-1-g7c22