cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #506 from mscherer/fix_370

Browse source 
Fix #370
This commit is contained in:
Toshio Kuratomi 2015-01-28 16:03:40 -08:00
commit 31a56e23f2
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source_control/subversion.py
View file

@ -123,7 +123,12 @@ class Subversion(object):
def export(self, force=False): def export(self, force=False):
'''Export svn repo to directory''' '''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): def switch(self):
'''Change working directory's repo.''' '''Change working directory's repo.'''
@ -173,7 +178,7 @@ def main():
dest=dict(required=True), dest=dict(required=True),
repo=dict(required=True, aliases=['name', 'repository']), repo=dict(required=True, aliases=['name', 'repository']),
revision=dict(default='HEAD', aliases=['rev', 'version']), revision=dict(default='HEAD', aliases=['rev', 'version']),
force=dict(default='yes', type='bool'), force=dict(default='no', type='bool'),
username=dict(required=False), username=dict(required=False),
password=dict(required=False), password=dict(required=False),
executable=dict(default=None), executable=dict(default=None),
@ -194,7 +199,7 @@ def main():
os.environ['LANG'] = 'C' os.environ['LANG'] = 'C'
svn = Subversion(module, dest, repo, revision, username, password, svn_path) 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 before = None
local_mods = False local_mods = False
if module.check_mode: if module.check_mode:
@ -202,7 +207,7 @@ def main():
if not export: if not export:
svn.checkout() svn.checkout()
else: else:
svn.export() svn.export(force=force)
elif os.path.exists("%s/.svn" % (dest, )): elif os.path.exists("%s/.svn" % (dest, )):
# Order matters. Need to get local mods before switch to avoid false # Order matters. Need to get local mods before switch to avoid false
# positives. Need to switch before revert to ensure we are reverting to # positives. Need to switch before revert to ensure we are reverting to
@ -222,9 +227,12 @@ def main():
else: else:
module.fail_json(msg="ERROR: %s folder already exists, but its not a subversion repository." % (dest, )) module.fail_json(msg="ERROR: %s folder already exists, but its not a subversion repository." % (dest, ))
after = svn.get_revision() if export:
changed = before != after or local_mods module.exit_json(changed=True)
module.exit_json(changed=changed, before=before, after=after) else:
after = svn.get_revision()
changed = before != after or local_mods
module.exit_json(changed=changed, before=before, after=after)
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *