diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Bzr.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bzr.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bzr.py b/src/lib/Bcfg2/Server/Plugins/Bzr.py index a71021cb5..4de204468 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bzr.py +++ b/src/lib/Bcfg2/Server/Plugins/Bzr.py @@ -1,35 +1,36 @@ +""" The Bzr plugin provides a revision interface for Bcfg2 repos using +bazaar. """ + import Bcfg2.Server.Plugin +# pylint: disable=F0401 from bzrlib.workingtree import WorkingTree from bzrlib import errors +# pylint: enable=F0401 -# for debugging output only -import logging -logger = logging.getLogger('Bcfg2.Plugins.Bzr') class Bzr(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Version): - """Bzr is a version plugin for dealing with Bcfg2 repos.""" - name = 'Bzr' + """ The Bzr plugin provides a revision interface for Bcfg2 repos + using bazaar. """ __author__ = 'bcfg-dev@mcs.anl.gov' def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) - self.core = core - self.datastore = datastore - - # Read revision from bcfg2 repo - revision = self.get_revision() - - logger.debug("Initialized Bazaar plugin with directory = %(dir)s at revision = %(rev)s" % {'dir': datastore, 'rev': revision}) + Bcfg2.Server.Plugin.Version.__init__(self, datastore) + self.logger.debug("Initialized Bazaar plugin with directory %s at " + "revision = %s" % (self.datastore, + self.get_revision())) def get_revision(self): """Read Bazaar revision information for the Bcfg2 repository.""" try: working_tree = WorkingTree.open(self.datastore) revision = str(working_tree.branch.revno()) - if working_tree.has_changes(working_tree.basis_tree()) or working_tree.unknowns(): + if (working_tree.has_changes(working_tree.basis_tree()) or + working_tree.unknowns()): revision += "+" except errors.NotBranchError: - logger.error("Failed to read Bazaar branch; disabling Bazaar support") - raise Bcfg2.Server.Plugin.PluginInitError + msg = "Failed to read Bazaar branch" + self.logger.error(msg) + raise Bcfg2.Server.Plugin.PluginExecutionError(msg) return revision |