recipe.mkdirectory: fix error message and ignore null path

66e1e032 · Julien Muchembled · a3d83b64 · 66e1e032
Commit 66e1e032 authored Mar 12, 2015 by Julien Muchembled
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

slapos/recipe/mkdirectory.py slapos/recipe/mkdirectory.py +2 -4

No files found.
--- a/slapos/recipe/mkdirectory.py
+++ b/slapos/recipe/mkdirectory.py
@@ -36,9 +36,7 @@ class Recipe(GenericBaseRecipe):
    self.mode = int(self.directory.pop('mode', '700'), 8)
  def install(self):
-    for path in sorted(self.directory.values()):
+    for path in sorted(self.directory.itervalues()):
-      if not os.path.exists(path):
+      if path and not os.path.isdir(path):
        os.makedirs(path, self.mode)
-      elif not os.path.isdir(path):
-        raise OSError("%s path exits, but it's not a directory.")
    return []