Issue 1514 - check_dir backport

diff --git a/wafadmin/Utils.py b/wafadmin/Utils.py
index 41dad570ebe14551d734bc1935072a59549d1c60..4961f2b401a84f66fa624537f9c9ff9da51d09cd 100644 (file)
--- a/wafadmin/Utils.py
+++ b/wafadmin/Utils.py
@@ -15,7 +15,7 @@ Utilities, the stable ones are the following:
 
        import stat
        def h_file(filename):
-               st = os.stat(filename)
+               st = os.lstat(filename)
                if stat.S_ISDIR(st[stat.ST_MODE]): raise IOError('not a file')
                m = Utils.md5()
                m.update(str(st.st_mtime))
@@ -418,13 +418,13 @@ def pprint(col, str, label='', sep='\n'):
 
 def check_dir(dir):
        """If a folder doesn't exists, create it."""
-       try:
-               os.stat(dir)
-       except OSError:
+       if not os.path.isdir(path):
                try:
-                       os.makedirs(dir)
-               except OSError, e:
-                       raise WafError("Cannot create folder '%s' (original error: %s)" % (dir, e))
+                       os.makedirs(path)
+               except OSError as e:
+                       if not os.path.isdir(path):
+                               raise Errors.WafError('Cannot create the folder %r' % path, ex=e)
+
 
 def cmd_output(cmd, **kw):