fixed a few issues pointed out by @resmo, pyflakes, pep8
This commit is contained in:
Kim Nørgaard
Matt Clay
parent
7cc2cd7881
commit
8a826d61e9
1 changed files with 50 additions and 35 deletions
|
|
@ -29,7 +29,7 @@ short_description: Package manager for Slackware >= 12.2
|
|||
description:
|
||||
- Manage binary packages for Slackware using 'slackpkg' which
|
||||
is available in versions after 12.2.
|
||||
version_added: "1.6"
|
||||
version_added: "2.0"
|
||||
options:
|
||||
name:
|
||||
description:
|
||||
|
|
@ -50,7 +50,8 @@ options:
|
|||
default: false
|
||||
choices: [ true, false ]
|
||||
|
||||
author: Kim Nørgaard
|
||||
author: Kim Nørgaard (@KimNorgaard)
|
||||
requirements: [ "Slackware" >= 12.2 ]
|
||||
notes: []
|
||||
'''
|
||||
|
||||
|
|
@ -63,18 +64,14 @@ EXAMPLES = '''
|
|||
'''
|
||||
|
||||
|
||||
import json
|
||||
import shlex
|
||||
import os
|
||||
import sys
|
||||
|
||||
def query_package(module, slackpkg_path, name):
|
||||
|
||||
import glob
|
||||
import platform
|
||||
|
||||
machine = platform.machine()
|
||||
packages = glob.glob("/var/log/packages/%s-*-[%s|noarch]*" % (name, machine))
|
||||
packages = glob.glob("/var/log/packages/%s-*-[%s|noarch]*" % (name,
|
||||
machine))
|
||||
|
||||
if len(packages) > 0:
|
||||
return True
|
||||
|
|
@ -92,9 +89,12 @@ def remove_packages(module, slackpkg_path, packages):
|
|||
continue
|
||||
|
||||
if not module.check_mode:
|
||||
rc, out, err = module.run_command("%s -default_answer=y -batch=on remove %s" % (slackpkg_path, package))
|
||||
rc, out, err = module.run_command("%s -default_answer=y -batch=on \
|
||||
remove %s" % (slackpkg_path,
|
||||
package))
|
||||
|
||||
if not module.check_mode and query_package(module, slackpkg_path, package):
|
||||
if not module.check_mode and query_package(module, slackpkg_path,
|
||||
package):
|
||||
module.fail_json(msg="failed to remove %s: %s" % (package, out))
|
||||
|
||||
remove_c += 1
|
||||
|
|
@ -115,55 +115,70 @@ def install_packages(module, slackpkg_path, packages):
|
|||
continue
|
||||
|
||||
if not module.check_mode:
|
||||
rc, out, err = module.run_command("%s -default_answer=y -batch=on install %s" % (slackpkg_path, package))
|
||||
rc, out, err = module.run_command("%s -default_answer=y -batch=on \
|
||||
install %s" % (slackpkg_path,
|
||||
package))
|
||||
|
||||
if not module.check_mode and not query_package(module, slackpkg_path, package):
|
||||
module.fail_json(msg="failed to install %s: %s" % (package, out), stderr=err)
|
||||
if not module.check_mode and not query_package(module, slackpkg_path,
|
||||
package):
|
||||
module.fail_json(msg="failed to install %s: %s" % (package, out),
|
||||
stderr=err)
|
||||
|
||||
install_c += 1
|
||||
|
||||
if install_c > 0:
|
||||
module.exit_json(changed=True, msg="present %s package(s)" % (install_c))
|
||||
module.exit_json(changed=True, msg="present %s package(s)"
|
||||
% (install_c))
|
||||
|
||||
module.exit_json(changed=False, msg="package(s) already present")
|
||||
|
||||
def upgrade_packages(module, slackpkg_path, packages):
|
||||
|
||||
def upgrade_packages(module, slackpkg_path, packages):
|
||||
install_c = 0
|
||||
|
||||
for package in packages:
|
||||
if not module.check_mode:
|
||||
rc, out, err = module.run_command("%s -default_answer=y -batch=on upgrade %s" % (slackpkg_path, package))
|
||||
rc, out, err = module.run_command("%s -default_answer=y -batch=on \
|
||||
upgrade %s" % (slackpkg_path,
|
||||
package))
|
||||
|
||||
if not module.check_mode and not query_package(module, slackpkg_path, package):
|
||||
module.fail_json(msg="failed to install %s: %s" % (package, out), stderr=err)
|
||||
if not module.check_mode and not query_package(module, slackpkg_path,
|
||||
package):
|
||||
module.fail_json(msg="failed to install %s: %s" % (package, out),
|
||||
stderr=err)
|
||||
|
||||
install_c += 1
|
||||
|
||||
if install_c > 0:
|
||||
module.exit_json(changed=True, msg="present %s package(s)" % (install_c))
|
||||
module.exit_json(changed=True, msg="present %s package(s)"
|
||||
% (install_c))
|
||||
|
||||
module.exit_json(changed=False, msg="package(s) already present")
|
||||
|
||||
|
||||
def update_cache(module, slackpkg_path):
|
||||
rc, out, err = module.run_command("%s -batch=on update" % (slackpkg_path))
|
||||
if rc != 0:
|
||||
module.fail_json(msg="Could not update package cache")
|
||||
|
||||
|
||||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
state = dict(default="installed", choices=['installed', 'removed', 'absent', 'present', 'latest']),
|
||||
name = dict(aliases=["pkg"], required=True),
|
||||
update_cache = dict(default=False, aliases=["update-cache"], type='bool'),
|
||||
argument_spec=dict(
|
||||
state=dict(default="installed", choices=['installed', 'removed',
|
||||
'absent', 'present',
|
||||
'latest']),
|
||||
name=dict(aliases=["pkg"], required=True, type='list'),
|
||||
update_cache=dict(default=False, aliases=["update-cache"],
|
||||
type='bool'),
|
||||
),
|
||||
supports_check_mode = True)
|
||||
supports_check_mode=True)
|
||||
|
||||
slackpkg_path = module.get_bin_path('slackpkg', True)
|
||||
|
||||
p = module.params
|
||||
|
||||
pkgs = p['name'].split(",")
|
||||
pkgs = p['name']
|
||||
|
||||
if p["update_cache"]:
|
||||
update_cache(module, slackpkg_path)
|
||||
|
|
@ -171,10 +186,10 @@ def main():
|
|||
if p['state'] == 'latest':
|
||||
upgrade_packages(module, slackpkg_path, pkgs)
|
||||
|
||||
elif p['state'] in [ 'present', 'installed' ]:
|
||||
elif p['state'] in ['present', 'installed']:
|
||||
install_packages(module, slackpkg_path, pkgs)
|
||||
|
||||
elif p["state"] in [ 'removed', 'absent' ]:
|
||||
elif p["state"] in ['removed', 'absent']:
|
||||
remove_packages(module, slackpkg_path, pkgs)
|
||||
|
||||
# import module snippets
|
||||
|
|
|
|||
Loading…
Reference in a new issue