From dcdfd3684115d11b21f9985754e38c6dc91006fa Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Sat, 18 Dec 2010 07:41:51 -0600 Subject: Plugin.Version: define parameters for commit_data --- src/lib/Server/Plugin.py | 2 +- src/lib/Server/Plugins/Svn2.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 95569e3ac..186d1198a 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -293,7 +293,7 @@ class Version(object): """Interact with various version control systems.""" def get_revision(self): return [] - def commit_data(self): + def commit_data(self, file_list, comment=None): pass # the rest of the file contains classes for coherent file caching diff --git a/src/lib/Server/Plugins/Svn2.py b/src/lib/Server/Plugins/Svn2.py index d0d7712f5..5af0655e9 100644 --- a/src/lib/Server/Plugins/Svn2.py +++ b/src/lib/Server/Plugins/Svn2.py @@ -53,10 +53,12 @@ class Svn2(Bcfg2.Server.Plugin.Plugin, self.revision = None return str(-1) - def commit_changes(self): + def commit_data(self, file_list, comment=None): """Commit changes into the repository""" + if not comment: + comment = 'Svn2: autocommit' try: - self.revision = self.client.checkin([self.datastore], 'Svn2: autocommit', + self.revision = self.client.checkin([self.datastore], comment, recurse=True) self.revision = self.client.update(self.datastore, recurse=True)[0] self.logger.info("Svn2: Commited changes. At %s" % self.revision.number) @@ -82,7 +84,7 @@ class Svn2(Bcfg2.Server.Plugin.Plugin, def Commit(self): """Svn2.Commit() => True|False\nCommit svn repository\n""" try: - self.commit_changes() + self.commit_changes([]) return True except: return False -- cgit v1.2.3-1-g7c22