Fail yum on invalid url with .rpm suffix

This commit is contained in:
Michael Vermaes 2014-01-15 12:20:31 +08:00
parent af0f0923ca
commit 8ad36e2c6b

View file

@ -473,7 +473,7 @@ 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)
# Fail on invalid urls: # Fail on invalid urls:
if '://' in spec and 'No package %s available.' % spec in out: 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 err = 'Package at %s could not be installed' % spec
module.fail_json(changed=False,msg=err,rc=1) module.fail_json(changed=False,msg=err,rc=1)
elif (rc != 0 and 'Nothing to do' in err) or 'Nothing to do' in out: elif (rc != 0 and 'Nothing to do' in err) or 'Nothing to do' in out: