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

Use the module's get_bin_path function to find 'apk' and reuse the return value in all functions

Browse source
This commit is contained in:
Kevin Brebanov 2015-08-03 16:14:09 -04:00
parent 6aaae617ca
commit 5d6f0d153c
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packaging/os/apk.py
View file

@ -88,10 +88,8 @@ EXAMPLES = '''
import os import os
import re import re
APK_PATH="/sbin/apk"
def update_package_db(module): def update_package_db(module):
cmd = "apk update" cmd = "%s update" % (APK_PATH)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc == 0: if rc == 0:
return True return True
@ -99,7 +97,7 @@ def update_package_db(module):
module.fail_json(msg="could not update package db") module.fail_json(msg="could not update package db")
def query_package(module, name): def query_package(module, name):
cmd = "apk -v info --installed %s" % (name) cmd = "%s -v info --installed %s" % (APK_PATH, name)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc == 0: if rc == 0:
return True return True
@ -107,7 +105,7 @@ def query_package(module, name):
return False return False
def query_latest(module, name): def query_latest(module, name):
cmd = "apk version %s" % (name) cmd = "%s version %s" % (APK_PATH, name)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
search_pattern = "(%s)-[\d\.\w]+-[\d\w]+\s+(.)\s+[\d\.\w]+-[\d\w]+\s+" % (name) search_pattern = "(%s)-[\d\.\w]+-[\d\w]+\s+(.)\s+[\d\.\w]+-[\d\w]+\s+" % (name)
match = re.search(search_pattern, stdout) match = re.search(search_pattern, stdout)
@ -117,9 +115,9 @@ def query_latest(module, name):
def upgrade_packages(module): def upgrade_packages(module):
if module.check_mode: if module.check_mode:
cmd = "apk upgrade --simulate" cmd = "%s upgrade --simulate" % (APK_PATH)
else: else:
cmd = "apk upgrade" cmd = "%s upgrade" % (APK_PATH)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc != 0: if rc != 0:
module.fail_json(msg="failed to upgrade packages") module.fail_json(msg="failed to upgrade packages")
@ -140,14 +138,14 @@ def install_packages(module, names, state):
names = " ".join(uninstalled) names = " ".join(uninstalled)
if upgrade: if upgrade:
if module.check_mode: if module.check_mode:
cmd = "apk add --upgrade --simulate %s" % (names) cmd = "%s add --upgrade --simulate %s" % (APK_PATH, names)
else: else:
cmd = "apk add --upgrade %s" % (names) cmd = "%s add --upgrade %s" % (APK_PATH, names)
else: else:
if module.check_mode: if module.check_mode:
cmd = "apk add --simulate %s" % (names) cmd = "%s add --simulate %s" % (APK_PATH, names)
else: else:
cmd = "apk add %s" % (names) cmd = "%s add %s" % (APK_PATH, names)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc != 0: if rc != 0:
module.fail_json(msg="failed to install %s" % (names)) module.fail_json(msg="failed to install %s" % (names))
@ -162,9 +160,9 @@ def remove_packages(module, names):
module.exit_json(changed=False, msg="package(s) already removed") module.exit_json(changed=False, msg="package(s) already removed")
names = " ".join(installed) names = " ".join(installed)
if module.check_mode: if module.check_mode:
cmd = "apk del --purge --simulate %s" % (names) cmd = "%s del --purge --simulate %s" % (APK_PATH, names)
else: else:
cmd = "apk del --purge %s" % (names) cmd = "%s del --purge %s" % (APK_PATH, names)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc != 0: if rc != 0:
module.fail_json(msg="failed to remove %s package(s)" % (names)) module.fail_json(msg="failed to remove %s package(s)" % (names))
@ -185,8 +183,8 @@ def main():
supports_check_mode = True supports_check_mode = True
) )
if not os.path.exists(APK_PATH): global APK_PATH
module.fail_json(msg="cannot find apk, looking for %s" % (APK_PATH)) APK_PATH = module.get_bin_path('apk', required=True)
p = module.params p = module.params