mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #3493 from eest/openbsd_pkg-fixes
openbsd_pkg corner case fixes
This commit is contained in:
commit
6aa1ecbc30
1 changed files with 48 additions and 17 deletions
|
@ -56,7 +56,7 @@ EXAMPLES = '''
|
||||||
# select whether we dump additional debug info through syslog
|
# select whether we dump additional debug info through syslog
|
||||||
syslogging = False
|
syslogging = False
|
||||||
|
|
||||||
# Function used for executing commands.
|
# Function used for executing commands.
|
||||||
def execute_command(cmd, syslogging):
|
def execute_command(cmd, syslogging):
|
||||||
if syslogging:
|
if syslogging:
|
||||||
syslog.openlog('ansible-%s' % os.path.basename(__file__))
|
syslog.openlog('ansible-%s' % os.path.basename(__file__))
|
||||||
|
@ -102,27 +102,50 @@ def get_package_state(name, specific_version):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# Function used to make sure a package is present.
|
# Function used to make sure a package is present.
|
||||||
def package_present(name, installed_state, module):
|
def package_present(name, installed_state, specific_version, module):
|
||||||
if module.check_mode:
|
if module.check_mode:
|
||||||
install_cmd = 'pkg_add -In'
|
install_cmd = 'pkg_add -Imn'
|
||||||
else:
|
else:
|
||||||
install_cmd = 'pkg_add -I'
|
install_cmd = 'pkg_add -Im'
|
||||||
|
|
||||||
if installed_state is False:
|
if installed_state is False:
|
||||||
|
|
||||||
# Attempt to install the package
|
# Attempt to install the package
|
||||||
(rc, stdout, stderr) = execute_command("%s %s" % (install_cmd, name), syslogging)
|
(rc, stdout, stderr) = execute_command("%s %s" % (install_cmd, name), syslogging)
|
||||||
|
|
||||||
# pkg_add returns 0 even if the package does not exist
|
# The behaviour of pkg_add is a bit different depending on if a
|
||||||
# so depend on stderr instead if something bad happened.
|
# specific version is supplied or not.
|
||||||
if stderr:
|
#
|
||||||
rc = 1
|
# When a specific version is supplied the return code will be 0 when
|
||||||
changed=False
|
# a package is found and 1 when it is not, if a version is not
|
||||||
|
# supplied the tool will exit 0 in both cases:
|
||||||
|
if specific_version:
|
||||||
|
# Depend on the return code.
|
||||||
|
if rc:
|
||||||
|
changed=False
|
||||||
else:
|
else:
|
||||||
|
# Depend on stderr instead.
|
||||||
|
if stderr:
|
||||||
|
# There is a corner case where having an empty directory in
|
||||||
|
# installpath prior to the right location will result in a
|
||||||
|
# "file:/local/package/directory/ is empty" message on stderr
|
||||||
|
# while still installing the package, so we need to look for
|
||||||
|
# for a message like "packagename-1.0: ok" just in case.
|
||||||
|
match = re.search("\W%s-[^:]+: ok\W" % name, stdout)
|
||||||
|
if match:
|
||||||
|
# It turns out we were able to install the package.
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
# We really did fail, fake the return code.
|
||||||
|
rc = 1
|
||||||
|
changed=False
|
||||||
|
|
||||||
|
if rc == 0:
|
||||||
if module.check_mode:
|
if module.check_mode:
|
||||||
module.exit_json(changed=True)
|
module.exit_json(changed=True)
|
||||||
|
|
||||||
changed=True
|
changed=True
|
||||||
|
|
||||||
else:
|
else:
|
||||||
rc = 0
|
rc = 0
|
||||||
stdout = ''
|
stdout = ''
|
||||||
|
@ -135,7 +158,7 @@ def package_present(name, installed_state, module):
|
||||||
def package_latest(name, installed_state, specific_version, module):
|
def package_latest(name, installed_state, specific_version, module):
|
||||||
if module.check_mode:
|
if module.check_mode:
|
||||||
upgrade_cmd = 'pkg_add -umn'
|
upgrade_cmd = 'pkg_add -umn'
|
||||||
else:
|
else:
|
||||||
upgrade_cmd = 'pkg_add -um'
|
upgrade_cmd = 'pkg_add -um'
|
||||||
|
|
||||||
pre_upgrade_name = ''
|
pre_upgrade_name = ''
|
||||||
|
@ -160,16 +183,24 @@ def package_latest(name, installed_state, specific_version, module):
|
||||||
else:
|
else:
|
||||||
changed = False
|
changed = False
|
||||||
|
|
||||||
# 'pkg_add -u' returns 0 even when something strange happened, stderr
|
# FIXME: This part is problematic. Based on the issues mentioned (and
|
||||||
# should be empty if everything went fine.
|
# handled) in package_present() it is not safe to blindly trust stderr
|
||||||
if stderr:
|
# as an indicator that the command failed, and in the case with
|
||||||
rc=1
|
# empty installpath directories this will break.
|
||||||
|
#
|
||||||
|
# For now keep this safeguard here, but ignore it if we managed to
|
||||||
|
# parse out a successful update above. This way we will report a
|
||||||
|
# successful run when we actually modify something but fail
|
||||||
|
# otherwise.
|
||||||
|
if changed != True:
|
||||||
|
if stderr:
|
||||||
|
rc=1
|
||||||
|
|
||||||
return (rc, stdout, stderr, changed)
|
return (rc, stdout, stderr, changed)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# If package was not installed at all just make it present.
|
# If package was not installed at all just make it present.
|
||||||
return package_present(name, installed_state, module)
|
return package_present(name, installed_state, specific_version, module)
|
||||||
|
|
||||||
# Function used to make sure a package is not installed.
|
# Function used to make sure a package is not installed.
|
||||||
def package_absent(name, installed_state, module):
|
def package_absent(name, installed_state, module):
|
||||||
|
@ -234,7 +265,7 @@ def main():
|
||||||
|
|
||||||
# Perform requested action
|
# Perform requested action
|
||||||
if state in ['installed', 'present']:
|
if state in ['installed', 'present']:
|
||||||
(rc, stdout, stderr, changed) = package_present(name, installed_state, module)
|
(rc, stdout, stderr, changed) = package_present(name, installed_state, specific_version, module)
|
||||||
elif state in ['absent', 'removed']:
|
elif state in ['absent', 'removed']:
|
||||||
(rc, stdout, stderr, changed) = package_absent(name, installed_state, module)
|
(rc, stdout, stderr, changed) = package_absent(name, installed_state, module)
|
||||||
elif state == 'latest':
|
elif state == 'latest':
|
||||||
|
|
Loading…
Reference in a new issue