From ccfdff4f0091c59d58421fecb14d8e86375eb406 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 13 Dec 2014 22:05:40 +0100 Subject: [PATCH 1/2] Make force parameter work for export operation The default is changed from 'yes' to 'no' to follow subversion behavior (ie, requiring explicit confirmation to erase a existing repository). Since that was not working before cf #370 and since the option was ignored before and unused, this should be safe to change. --- source_control/subversion.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source_control/subversion.py b/source_control/subversion.py index 6709a8c3939..e3a013cc340 100644 --- a/source_control/subversion.py +++ b/source_control/subversion.py @@ -123,7 +123,12 @@ class Subversion(object): def export(self, force=False): '''Export svn repo to directory''' - self._exec(["export", "-r", self.revision, self.repo, self.dest]) + cmd = ["export"] + if force: + cmd.append("--force") + cmd.extend(["-r", self.revision, self.repo, self.dest]) + + self._exec(cmd) def switch(self): '''Change working directory's repo.''' @@ -173,7 +178,7 @@ def main(): dest=dict(required=True), repo=dict(required=True, aliases=['name', 'repository']), revision=dict(default='HEAD', aliases=['rev', 'version']), - force=dict(default='yes', type='bool'), + force=dict(default='no', type='bool'), username=dict(required=False), password=dict(required=False), executable=dict(default=None), @@ -202,7 +207,7 @@ def main(): if not export: svn.checkout() else: - svn.export() + svn.export(force=force) elif os.path.exists("%s/.svn" % (dest, )): # Order matters. Need to get local mods before switch to avoid false # positives. Need to switch before revert to ensure we are reverting to From fa46f3c269194bfd05b5f4b330d3e8c00d17b38d Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 13 Dec 2014 22:07:41 +0100 Subject: [PATCH 2/2] Fix #370, by allowing to export over a existing repository This requires to use force=True --- source_control/subversion.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source_control/subversion.py b/source_control/subversion.py index e3a013cc340..8f6d81e5694 100644 --- a/source_control/subversion.py +++ b/source_control/subversion.py @@ -199,7 +199,7 @@ def main(): os.environ['LANG'] = 'C' svn = Subversion(module, dest, repo, revision, username, password, svn_path) - if not os.path.exists(dest): + if export or not os.path.exists(dest): before = None local_mods = False if module.check_mode: @@ -227,9 +227,12 @@ def main(): else: module.fail_json(msg="ERROR: %s folder already exists, but its not a subversion repository." % (dest, )) - after = svn.get_revision() - changed = before != after or local_mods - module.exit_json(changed=changed, before=before, after=after) + if export: + module.exit_json(changed=True) + else: + after = svn.get_revision() + changed = before != after or local_mods + module.exit_json(changed=changed, before=before, after=after) # import module snippets from ansible.module_utils.basic import *