From b339485da887547f2881f9f6fb0e707c451fb796 Mon Sep 17 00:00:00 2001 From: Skylar Saveland Date: Thu, 26 Sep 2013 14:27:40 -0700 Subject: [PATCH] add executable option to subversion module --- library/source_control/subversion | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/library/source_control/subversion b/library/source_control/subversion index b868083927f..f2ca299c64e 100644 --- a/library/source_control/subversion +++ b/library/source_control/subversion @@ -63,6 +63,13 @@ options: - --password parameter passed to svn. required: false default: null + executable: + required: false + default: null + version_added: "1.4" + description: + - Path to svn executable to use. If not supplied, + the normal mechanism for resolving binary paths will be used. ''' EXAMPLES = ''' @@ -71,19 +78,27 @@ EXAMPLES = ''' ''' import re +import tempfile class Subversion(object): - def __init__(self, module, dest, repo, revision, username, password): + def __init__( + self, module, dest, repo, revision, username, password, svn_path): self.module = module self.dest = dest self.repo = repo self.revision = revision self.username = username self.password = password + self.svn_path = svn_path def _exec(self, args): - bits = ["svn --non-interactive --trust-server-cert --no-auth-cache", ] + bits = [ + self.svn_path, + '--non-interactive', + '--trust-server-cert', + '--no-auth-cache', + ] if self.username: bits.append("--username '%s'" % self.username) if self.password: @@ -147,6 +162,7 @@ def main(): force=dict(default='yes', type='bool'), username=dict(required=False), password=dict(required=False), + executable=dict(default=None), ), supports_check_mode=True ) @@ -157,8 +173,9 @@ def main(): force = module.params['force'] username = module.params['username'] password = module.params['password'] + svn_path = module.params['executable'] or module.get_bin_path('svn', True) - svn = Subversion(module, dest, repo, revision, username, password) + svn = Subversion(module, dest, repo, revision, username, password, svn_path) if not os.path.exists(dest): before = None