Custom Query (894 matches)

this should probably go in reports_reason please add a field with last modify time

thank you

this might sounds like a crazy request. but it seems to be the best way I could reuse code between probes.

sometimes identical logic needs to be used in several probes script. but no code reuse is possible between them unless I push a library script on all my system. which I don't want to update every now and then. I like the way bcfg2 push those probes script and runs them.

I think it'd be cool to preprocess the probes with TGenshi for more power... In the mean time, I guess I can push the file with a TGenshi ConfigFile? entry and ask the probe to run it. but people here don't like to push scripts with bcfg2.

unless you tell me a probe/group can output multiples group/probe entry?

diff --git a/src/lib/Server/Admin/Compare.py b/src/lib/Server/Admin/Compare.py index 8d4dda3..124c0c6 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/Base.py b/src/lib/Server/Plugins/Base.py index 2a84923..d27f057 100644 --- a/src/lib/Server/Plugins/Base.py +++ b/src/lib/Server/Plugins/Base.py @@ -24,7 +24,7 @@ class Base(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.XMLDirectoryBacked):

def BuildStructures?(self, metadata):

Build structures for client described by metadata

• ret = lxml.etree.Element("Independant", version='2.0')

+ ret = lxml.etree.Element("Independent", version='2.0')

fragments = reduce(lambda x, y: x+y,

[base.Match(metadata) for base in self.entries.values()], [])

[ret.append(copy.deepcopy(frag)) for frag in fragments]

diff --git a/src/lib/Server/Plugins/Deps.py b/src/lib/Server/Plugins/Deps.py index ef1bc86..21ff302 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 9caa7e7..9244bb8 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 76541b3..159ff85 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 %} <tr><td align="right"><b>Version: </b></td><td>{{item.reason.current_version}}</td><td>{{item.reason.version}}</td></tr> {% endif %}{% if not item.reason.current_exists %}

-<tr><td align="right"><b>Existance: </b></td><td colspan=2>This item does not currently exist on the host but is specified to exist in the configuration.</td></tr> +<tr><td align="right"><b>Existence: </b></td><td colspan=2>This item does not currently exist on the host but is specified to exist in the configuration.</td></tr>

{% endif %}{% if item.reason.current_diff %} <tr><td align="right"><b>NDiff: </b></td><td colspan=2><pre>{{item.reason.current_diff|syntaxhilight:"diff"}}</pre></td></tr> {% endif %}