internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various cleanup to run_command

Browse Source 
* Rename fail_on_rc_non_zero to check_rc, much more succinct.
* Simplify method defintion
* Fix command module and drop shell=shell option; whether to use
  shell is determined by if args is a list.
This commit is contained in:
Stephen Fromm
2013-01-13 09:12:40 -08:00
parent 4f110e4fc6
commit 4eaee3df0a
7 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/git
View File

@@ -81,7 +81,7 @@ def clone(module, repo, dest, remote):
pass
os.chdir(dest_dirname)
return module.run_command("git clone -o %s %s %s" % (remote, repo, dest),
fail_on_rc_non_zero=True)
check_rc=True)
def has_local_mods(dest):
os.chdir(dest)
@@ -99,7 +99,7 @@ def reset(module,dest,force):
os.chdir(dest)
if not force and has_local_mods(dest):
module.fail_json(msg="Local modifications exist in repository (force=no).")
return module.run_command("git reset --hard HEAD", fail_on_rc_non_zero=True)
return module.run_command("git reset --hard HEAD", check_rc=True)
def get_branches(module, dest):
os.chdir(dest)
@@ -210,7 +210,7 @@ def switch_version(module, dest, remote, version):
if rc != 0:
module.fail_json(msg="Failed to checkout branch %s" % branch)
cmd = "git reset --hard %s" % remote
return module.run_command(cmd, fail_on_rc_non_zero=True)
return module.run_command(cmd, check_rc=True)
# ===========================================