Merge branch 'devel' of git://github.com/willthames/ansible into devel

This commit is contained in:
Michael DeHaan
2012-10-18 20:23:10 -04:00
3 changed files with 67 additions and 2 deletions

View File

@@ -29,8 +29,6 @@ def get_config(p, section, key, env_var, default):
try:
return p.get(section, key)
except:
if env_var is not None:
return os.environ.get(env_var, default)
return default
else:
return default