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

git: Remove unnecessary return code checking.

Browse source 
The functions either return rc=0 or call fail_json themselves.
This commit is contained in:
Yap Sok Ann 2013-10-16 18:51:36 +08:00
parent 201ff02d1f
commit 3ff0c6d50d
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source_control/git
View file

@ -337,7 +337,7 @@ def main():
if not os.path.exists(gitconfig): if not os.path.exists(gitconfig):
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)
(rc, out, err) = clone(git_path, module, repo, dest, remote, depth, version) clone(git_path, module, repo, dest, remote, depth, version)
elif not update: elif not update:
# Just return having found a repo already in the dest path # Just return having found a repo already in the dest path
# this does no checking that the repo is the actual repo # this does no checking that the repo is the actual repo
@ -351,9 +351,7 @@ def main():
# if force, do a reset # if force, do a reset
if local_mods and module.check_mode: if local_mods and module.check_mode:
module.exit_json(changed=True, msg='Local modifications exist') module.exit_json(changed=True, msg='Local modifications exist')
(rc, out, err) = reset(git_path, module, dest, force) reset(git_path, module, dest, force)
if rc != 0:
module.fail_json(msg=err)
# exit if already at desired sha version # exit if already at desired sha version
if before == version: if before == version:
module.exit_json(changed=False) module.exit_json(changed=False)
@ -375,15 +373,11 @@ def main():
else: else:
changed = False changed = False
module.exit_json(changed=changed, before=before, after=remote_head) module.exit_json(changed=changed, before=before, after=remote_head)
(rc, out, err) = fetch(git_path, module, repo, dest, version, remote) fetch(git_path, module, repo, dest, version, remote)
if rc != 0:
module.fail_json(msg=err)
# switch to version specified regardless of whether # switch to version specified regardless of whether
# we cloned or pulled # we cloned or pulled
(rc, out, err) = switch_version(git_path, module, dest, remote, version) switch_version(git_path, module, dest, remote, version)
if rc != 0:
module.fail_json(msg=err)
# determine if we changed anything # determine if we changed anything
after = get_version(git_path, dest) after = get_version(git_path, dest)