ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Bugfix: Respect PATH env variable in zypper modules (#2094) (#2108)

Browse source 
* Bugfix: Respect PATH env variable in zypper modules

* Improve changelogs/fragments/2094-bugfix-respect-PATH-env-variable-in-zypper-modules.yaml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit e7a0a12c3f)

Co-authored-by: Stefan Richter <sealor@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2021-03-25 22:49:59 +01:00 committed by GitHub
parent 9a647554b6
commit 3d923f06ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/2094-bugfix-respect-PATH-env-variable-in-zypper-modules.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- zypper, zypper_repository - respect ``PATH`` environment variable when resolving zypper executable path (https://github.com/ansible-collections/community.general/pull/2094).

2
plugins/modules/packaging/os/zypper.py
View file

@ -336,7 +336,7 @@ def get_cmd(m, subcommand):
"puts together the basic zypper command arguments with those passed to the module" "puts together the basic zypper command arguments with those passed to the module"
is_install = subcommand in ['install', 'update', 'patch', 'dist-upgrade'] is_install = subcommand in ['install', 'update', 'patch', 'dist-upgrade']
is_refresh = subcommand == 'refresh' is_refresh = subcommand == 'refresh'
cmd = ['/usr/bin/zypper', '--quiet', '--non-interactive', '--xmlout'] cmd = [m.get_bin_path('zypper', required=True), '--quiet', '--non-interactive', '--xmlout']
if m.params['extra_args_precommand']: if m.params['extra_args_precommand']:
args_list = m.params['extra_args_precommand'].split() args_list = m.params['extra_args_precommand'].split()
cmd.extend(args_list) cmd.extend(args_list)

16
plugins/modules/packaging/os/zypper_repository.py
View file

@ -141,9 +141,9 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib
REPO_OPTS = ['alias', 'name', 'priority', 'enabled', 'autorefresh', 'gpgcheck'] REPO_OPTS = ['alias', 'name', 'priority', 'enabled', 'autorefresh', 'gpgcheck']
def _get_cmd(*args): def _get_cmd(module, *args):
"""Combines the non-interactive zypper command with arguments/subcommands""" """Combines the non-interactive zypper command with arguments/subcommands"""
cmd = ['/usr/bin/zypper', '--quiet', '--non-interactive'] cmd = [module.get_bin_path('zypper', required=True), '--quiet', '--non-interactive']
cmd.extend(args) cmd.extend(args)
return cmd return cmd
@ -151,7 +151,7 @@ def _get_cmd(*args):
def _parse_repos(module): def _parse_repos(module):
"""parses the output of zypper --xmlout repos and return a parse repo dictionary""" """parses the output of zypper --xmlout repos and return a parse repo dictionary"""
cmd = _get_cmd('--xmlout', 'repos') cmd = _get_cmd(module, '--xmlout', 'repos')
if not HAS_XML: if not HAS_XML:
module.fail_json(msg=missing_required_lib("python-xml"), exception=XML_IMP_ERR) module.fail_json(msg=missing_required_lib("python-xml"), exception=XML_IMP_ERR)
@ -230,7 +230,7 @@ def repo_exists(module, repodata, overwrite_multiple):
def addmodify_repo(module, repodata, old_repos, zypper_version, warnings): def addmodify_repo(module, repodata, old_repos, zypper_version, warnings):
"Adds the repo, removes old repos before, that would conflict." "Adds the repo, removes old repos before, that would conflict."
repo = repodata['url'] repo = repodata['url']
cmd = _get_cmd('addrepo', '--check') cmd = _get_cmd(module, 'addrepo', '--check')
if repodata['name']: if repodata['name']:
cmd.extend(['--name', repodata['name']]) cmd.extend(['--name', repodata['name']])
@ -274,14 +274,14 @@ def addmodify_repo(module, repodata, old_repos, zypper_version, warnings):
def remove_repo(module, repo): def remove_repo(module, repo):
"Removes the repo." "Removes the repo."
cmd = _get_cmd('removerepo', repo) cmd = _get_cmd(module, 'removerepo', repo)
rc, stdout, stderr = module.run_command(cmd, check_rc=True) rc, stdout, stderr = module.run_command(cmd, check_rc=True)
return rc, stdout, stderr return rc, stdout, stderr
def get_zypper_version(module): def get_zypper_version(module):
rc, stdout, stderr = module.run_command(['/usr/bin/zypper', '--version']) rc, stdout, stderr = module.run_command([module.get_bin_path('zypper', required=True), '--version'])
if rc != 0 or not stdout.startswith('zypper '): if rc != 0 or not stdout.startswith('zypper '):
return LooseVersion('1.0') return LooseVersion('1.0')
return LooseVersion(stdout.split()[1]) return LooseVersion(stdout.split()[1])
@ -290,9 +290,9 @@ def get_zypper_version(module):
def runrefreshrepo(module, auto_import_keys=False, shortname=None): def runrefreshrepo(module, auto_import_keys=False, shortname=None):
"Forces zypper to refresh repo metadata." "Forces zypper to refresh repo metadata."
if auto_import_keys: if auto_import_keys:
cmd = _get_cmd('--gpg-auto-import-keys', 'refresh', '--force') cmd = _get_cmd(module, '--gpg-auto-import-keys', 'refresh', '--force')
else: else:
cmd = _get_cmd('refresh', '--force') cmd = _get_cmd(module, 'refresh', '--force')
if shortname is not None: if shortname is not None:
cmd.extend(['-r', shortname]) cmd.extend(['-r', shortname])