diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-10-07 13:34:51 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-10-07 13:34:51 +0000 |
| commit | e686d3b69600441e943c2913542e5477af528d87 (patch) | |
| tree | 8b24c557303e4c64f9b63c6ee55704ff753ddb50 | |
| parent | 421b10ebfb679a0461eb9f593a9b22bc390b19b1 (diff) | |
| download | bcfg2-e686d3b69600441e943c2913542e5477af528d87.tar.gz bcfg2-e686d3b69600441e943c2913542e5477af528d87.tar.bz2 bcfg2-e686d3b69600441e943c2913542e5477af528d87.zip | |
Remove GBundler plugin (this functionality already exists in Bundler)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5476 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Server/Plugins/GBundler.py | 39 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/__init__.py | 1 |
2 files changed, 0 insertions, 40 deletions
diff --git a/src/lib/Server/Plugins/GBundler.py b/src/lib/Server/Plugins/GBundler.py deleted file mode 100644 index a5abe407b..000000000 --- a/src/lib/Server/Plugins/GBundler.py +++ /dev/null @@ -1,39 +0,0 @@ - -import logging, re -import genshi.template -import SGenshi - -pattern = '(.*/)?(\S+)\.xml(\.((H_(?P<hostname>\S+))|' -pattern += '(G(?P<prio>\d+)_(?P<group>\S+))))?$' - -matcher = re.compile(pattern) - -logger = logging.getLogger('GBundler') - -class GBundlerEntrySet(SGenshi.SGenshiEntrySet): - def BuildStructures(self, metadata): - '''Build SGenshi structures''' - ret = [] - found = [] - build = [] - matching = self.get_matching(metadata) - matching.sort(lambda x,y: cmp(x.specific, y.specific)) - for entry in matching[:]: - rem = matcher.match(entry.name) - bname = rem.group(2) - if bname in metadata.bundles and bname not in found: - found.append(bname) - build.append(entry) - - for entry in build: - try: - ret.append(entry.get_xml_value(metadata)) - except genshi.template.TemplateError, terror: - logger.error('Genshi template error: %s' % terror) - logger.error("GBundler: Failed to template file %s" % entry.name) - return ret - -class GBundler(GBundlerEntrySet, SGenshi.SGenshi): - name = 'GBundler' - __version__ = '$Revision$' - diff --git a/src/lib/Server/Plugins/__init__.py b/src/lib/Server/Plugins/__init__.py index 4b724c3dd..8db59ecc0 100644 --- a/src/lib/Server/Plugins/__init__.py +++ b/src/lib/Server/Plugins/__init__.py @@ -9,7 +9,6 @@ __all__ = [ 'Cfg', 'Decisions', 'Fossil', - 'GBundler', 'Git', 'GroupPatterns', 'Hostbase', |