Improve the error message for missing files

e2161168 · Daniel Hokka Zakrisson · f1f44843 · e2161168
Commit e2161168 authored Oct 25, 2012 by Daniel Hokka Zakrisson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

lib/ansible/utils.py
+3 -1

No files found.
--- a/lib/ansible/utils.py
+++ b/lib/ansible/utils.py
@@ -407,8 +407,10 @@ def template_from_file(basedir, path, vars):
    environment.filters['from_yaml'] = yaml.load
    try:
        data = codecs.open(realpath, encoding="utf8").read()
-    except:
+    except UnicodeDecodeError:
        raise errors.AnsibleError("unable to process as utf-8: %s" % realpath)
+    except:
+        raise errors.AnsibleError("unable to read %s" % realpath)
    t = environment.from_string(data)
    vars = vars.copy()
    try: