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

Some optimizations to previous code.

Browse source
This commit is contained in:
Christoph Seitz 2012-08-01 18:43:39 +02:00
parent 418445d3c5
commit b973910283
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
library/apt
View file

@ -69,23 +69,20 @@ def package_status(m, pkgname, version, cache):
return pkg.isInstalled, pkg.isUpgradable return pkg.isInstalled, pkg.isUpgradable
def install(m, 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):
packages = list() packages = ""
for package in pkgspec: for package in pkgspec:
name, version = package_split(package) name, version = package_split(package)
installed, upgradable = package_status(m, 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):
packages.append(package) packages += "'%s' " % package
if len(packages) >0: if len(packages) != 0:
if force: if force:
force_yes = '--force-yes' force_yes = '--force-yes'
else: else:
force_yes = '' force_yes = ''
cmd = "%s --option Dpkg::Options::=--force-confold -q -y %s install " % (APT, force_yes) cmd = "%s --option Dpkg::Options::=--force-confold -q -y %s install %s" % (APT, force_yes,packages)
for package in packages:
cmd += " '%s'" % package
if default_release: if default_release:
cmd += " -t '%s'" % (default_release,) cmd += " -t '%s'" % (default_release,)
if not install_recommends: if not install_recommends:
@ -100,20 +97,18 @@ def install(m, pkgspec, cache, upgrade=False, default_release=None, install_reco
m.exit_json(changed=False) m.exit_json(changed=False)
def remove(m, pkgspec, cache, purge=False): def remove(m, pkgspec, cache, purge=False):
packages = list() packages = ""
for package in pkgspec: for package in pkgspec:
name, version = package_split(package) name, version = package_split(package)
installed, upgradable = package_status(m, name, version, cache) installed, upgradable = package_status(m, name, version, cache)
if installed: if installed:
packages.append(name) packages += "'%s' " % package
if len(packages) == 0: if len(packages) == 0:
m.exit_json(changed=False) m.exit_json(changed=False)
else: else:
purge = '--purge' if purge else '' purge = '--purge' if purge else ''
cmd = "%s -q -y %s remove" % (APT, purge) cmd = "%s -q -y %s remove %s" % (APT, purge,packages)
for package in packages:
cmd += " '%s'" % package
rc, out, err = run_apt(cmd) rc, out, err = run_apt(cmd)
if rc: if rc:
m.fail_json(msg="'apt-get remove %s' failed: %s" % (packages, err)) m.fail_json(msg="'apt-get remove %s' failed: %s" % (packages, err))
@ -162,19 +157,18 @@ def main():
force_yes = module.boolean(p['force']) force_yes = module.boolean(p['force'])
packages = p['package'].split(',') packages = p['package'].split(',')
latest = p['state'] == 'latest'
for package in packages: for package in packages:
if package.count('=') > 1: if package.count('=') > 1:
module.fail_json(msg="invalid package spec: %s" % packages) module.fail_json(msg="invalid package spec: %s" % package)
if latest and '=' in package:
module.fail_json(msg='version number inconsistent with state=latest: %s' % package)
if p['state'] == 'latest': if p['state'] == 'latest':
for package in packages:
if '=' in package:
module.fail_json(msg='version number inconsistent with state=latest')
install(module, packages, cache, upgrade=True, install(module, packages, 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':
install(module, packages, cache, default_release=p['default_release'], install(module, packages, cache, default_release=p['default_release'],
install_recommends=install_recommends,force=force_yes) install_recommends=install_recommends,force=force_yes)