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

Merge pull request #5333 from mvermaes/yum_fix

Browse source 
yum module: Attempt #2 to cause yum to fail on invalid url
This commit is contained in:
jctanner 2014-01-20 06:45:01 -08:00
commit 4a13fb4925
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/yum
View file

@ -485,7 +485,11 @@ def install(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if (rc != 0 and 'Nothing to do' in err) or 'Nothing to do' in out: # Fail on invalid urls:
if (rc == 1 and '://' in spec and ('No package %s available.' % spec in out or 'Cannot open: %s. Skipping.' % spec in err)):
err = 'Package at %s could not be installed' % spec
module.fail_json(changed=False,msg=err,rc=1)
elif (rc != 0 and 'Nothing to do' in err) or 'Nothing to do' in out:
# avoid failing in the 'Nothing To Do' case # avoid failing in the 'Nothing To Do' case
# this may happen with an URL spec. # this may happen with an URL spec.
# for an already installed group, # for an already installed group,