From a7d489e63e4e887b972c2c362fff532daef994a4 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Sat, 18 Dec 2010 08:21:42 -0600 Subject: Admin.Pull: Add commit support to PulEntry --- src/lib/Server/Admin/Pull.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Admin/Pull.py') diff --git a/src/lib/Server/Admin/Pull.py b/src/lib/Server/Admin/Pull.py index aa732c67f..cb837abc4 100644 --- a/src/lib/Server/Admin/Pull.py +++ b/src/lib/Server/Admin/Pull.py @@ -135,4 +135,9 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): except Bcfg2.Server.Plugin.PluginExecutionError: self.errExit("Configuration upload not supported by plugin %s" \ % (plugin.name)) - # FIXME svn commit if running under svn + # commit if running under a VCS + for plugin in self.bcore.plugins.values(): + if isinstance(plugin, Bcfg2.Server.Plugin.Version): + files = "%s/%s" % (plugin.data, ename) + comment = 'file "%s" pulled from host %s' % (files, client) + plugin.commit_data([files], comment) -- cgit v1.2.3-1-g7c22 From 50c759ba20f513acc9745427c1ccad4ee4227e84 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Sat, 18 Dec 2010 08:43:09 -0600 Subject: Admin.Pull: Fix generator plugin name --- src/lib/Server/Admin/Pull.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Admin/Pull.py') diff --git a/src/lib/Server/Admin/Pull.py b/src/lib/Server/Admin/Pull.py index cb837abc4..289852f79 100644 --- a/src/lib/Server/Admin/Pull.py +++ b/src/lib/Server/Admin/Pull.py @@ -136,8 +136,8 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): self.errExit("Configuration upload not supported by plugin %s" \ % (plugin.name)) # commit if running under a VCS - for plugin in self.bcore.plugins.values(): - if isinstance(plugin, Bcfg2.Server.Plugin.Version): + for vcsplugin in self.bcore.plugins.values(): + if isinstance(vcsplugin, Bcfg2.Server.Plugin.Version): files = "%s/%s" % (plugin.data, ename) comment = 'file "%s" pulled from host %s' % (files, client) - plugin.commit_data([files], comment) + vcsplugin.commit_data([files], comment) -- cgit v1.2.3-1-g7c22