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

Code review changes

Browse source 
1. Passing the module to the various functions so that they can use module.fail_json and module.exit_json methods inside.
2. Because of point 1, install and remove methods do not return anything. Instead, they use the module functions itself.
3. Move the import statement (for apt and apt_pkg) inside main function so on import error, we can use module.fail_json to print the error.
This commit is contained in:
Nikhil Singh 2012-07-26 17:29:15 +05:30
parent 4d6b3713a7
commit 8d283f8194
1 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apt
View file

@ -22,15 +22,10 @@ import traceback
import warnings; import warnings;
warnings.filterwarnings('ignore', "apt API not stable yet", FutureWarning) warnings.filterwarnings('ignore', "apt API not stable yet", FutureWarning)
# APT related constants
APT_PATH = "/usr/bin/apt-get" APT_PATH = "/usr/bin/apt-get"
APT = "DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical %s" % APT_PATH APT = "DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical %s" % APT_PATH
try:
import apt, apt_pkg
except ImportError:
json.dumps(dict(msg="could not import apt, please install the python-apt package on this host", failed=True))
sys.exit(1)
def run_apt(command): def run_apt(command):
try: try:
cmd = subprocess.Popen(command, shell=True, cmd = subprocess.Popen(command, shell=True,
@ -55,11 +50,11 @@ def package_split(pkgspec):
else: else:
return parts[0], None return parts[0], None
def package_status(pkgname, version, cache): def package_status(m, pkgname, version, cache):
try: try:
pkg = cache[pkgname] pkg = cache[pkgname]
except KeyError: except KeyError:
fail_json(msg="No package matching '%s' is available" % pkgname) m.fail_json(msg="No package matching '%s' is available" % pkgname)
if version: if version:
try : try :
return pkg.is_installed and pkg.installed.version == version, False return pkg.is_installed and pkg.installed.version == version, False
@ -73,9 +68,9 @@ def package_status(pkgname, version, cache):
#assume older version of python-apt is installed #assume older version of python-apt is installed
return pkg.isInstalled, pkg.isUpgradable return pkg.isInstalled, pkg.isUpgradable
def install(pkgspec, cache, upgrade=False, default_release=None, install_recommends=True, force=False): def install(m, pkgspec, cache, upgrade=False, default_release=None, install_recommends=True, force=False):
name, version = package_split(pkgspec) name, version = package_split(pkgspec)
installed, upgradable = package_status(name, version, cache) installed, upgradable = package_status(m, name, version, cache)
if not installed or (upgrade and upgradable): if not installed or (upgrade and upgradable):
if force: if force:
force_yes = '--force-yes' force_yes = '--force-yes'
@ -89,20 +84,25 @@ def install(pkgspec, cache, upgrade=False, default_release=None, install_recomme
cmd += " --no-install-recommends" cmd += " --no-install-recommends"
rc, out, err = run_apt(cmd) rc, out, err = run_apt(cmd)
return rc, out, err if rc:
m.fail_json(msg="'apt-get install %s' failed: %s" % (pkgspec, err))
else: else:
return -1, "", "" # -1 depicts that nothing was changed m.exit_json(changed=True)
else:
m.exit_json(changed=False)
def remove(pkgspec, cache, purge=False): def remove(m, pkgspec, cache, purge=False):
name, version = package_split(pkgspec) name, version = package_split(pkgspec)
installed, upgradable = package_status(name, version, cache) installed, upgradable = package_status(m, name, version, cache)
if not installed: if not installed:
return -1, "", "" # -1 depicts nothing was changed m.exit_json(changed=False)
else: else:
purge = '--purge' if purge else '' purge = '--purge' if purge else ''
cmd = "%s -q -y %s remove '%s'" % (APT, purge, name) cmd = "%s -q -y %s remove '%s'" % (APT, purge, name)
rc, out, err = run_apt(cmd) rc, out, err = run_apt(cmd)
return rc, out, error if rc:
m.fail_json(msg="'apt-get remove %s' failed: %s" % (name, err))
m.exit_json(changed=True)
def main(): def main():
@ -118,6 +118,11 @@ def main():
) )
) )
try:
import apt, apt_pkg
except:
module.fail_json("Could not import python modules: apt, apt_pkg. Please install python-apt package.")
if not os.path.exists(APT_PATH): if not os.path.exists(APT_PATH):
module.fail_json(msg="Cannot find apt-get") module.fail_json(msg="Cannot find apt-get")
@ -148,27 +153,18 @@ def main():
module.fail_json(msg='invalid package spec') module.fail_json(msg='invalid package spec')
if p['state'] == 'latest': if p['state'] == 'latest':
if '=' in package: if '=' in p['package']:
module.fail_json(msg='version number inconsistent with state=latest') module.fail_json(msg='version number inconsistent with state=latest')
install(module, p['package'], cache, upgrade=True,
rc, out, err = install(p['package'], cache, upgrade=True,
default_release=p['default_release'], default_release=p['default_release'],
install_recommends=install_recommends, install_recommends=install_recommends,
force=force_yes) force=force_yes)
elif p['state'] == 'installed': elif p['state'] == 'installed':
rc, out, err = install(p['package'], cache, default_release=p['default_release'], install(module, p['package'], cache, default_release=p['default_release'],
install_recommends=install_recommends,force=force_yes) install_recommends=install_recommends,force=force_yes)
elif p['state'] == 'removed': elif p['state'] == 'removed':
rc, out, err = remove(p['package'], cache, purge == 'yes') remove(module, p['package'], cache, purge == 'yes')
if rc:
if rc == -1:
module.exit_json(changed=False)
else:
module.fail_json(msg=err)
else:
module.exit_json(changed=True)
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>