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

Merge pull request #1189 from ansible/dnf-hang

Browse source 
The dnf API appears to hang if the user does not have adequate permissions
This commit is contained in:
Toshio Kuratomi 2015-11-02 08:02:52 -08:00
commit 08986221cb
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packaging/os/dnf.py
View file

@ -234,9 +234,6 @@ def _mark_package_install(module, base, pkg_spec):
def ensure(module, base, state, names):
if not util.am_i_root():
module.fail_json(msg="This command has to be run under the root user.")
if names == ['*'] and state == 'latest':
base.upgrade_all()
else:
@ -330,12 +327,20 @@ def main():
mutually_exclusive=[['name', 'list']],
supports_check_mode=True)
params = module.params
base = _base(
module, params['conf_file'], params['disable_gpg_check'],
params['disablerepo'], params['enablerepo'])
if params['list']:
base = _base(
module, params['conf_file'], params['disable_gpg_check'],
params['disablerepo'], params['enablerepo'])
list_items(module, base, params['list'])
else:
# Note: base takes a long time to run so we want to check for failure
# before running it.
if not util.am_i_root():
module.fail_json(msg="This command has to be run under the root user.")
base = _base(
module, params['conf_file'], params['disable_gpg_check'],
params['disablerepo'], params['enablerepo'])
ensure(module, base, params['state'], params['name'])