* Merged the no-bdb branch (-r10900:HEAD

  https://svn.nixos.org/repos/nix/nix/branches/no-bdb).

2 files changed, 7 insertions, 2 deletions

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index f978856a96..e18f9841fd 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -361,9 +361,10 @@ Path createTempDir(const Path & tmpRoot, const Path & prefix,
 
 Paths createDirs(const Path & path)
 {
-    if (path == "/") return Paths();
-    Paths created = createDirs(dirOf(path));
+    Paths created;
+    if (path == "/") return created;
     if (!pathExists(path)) {
+        created = createDirs(dirOf(path));
         if (mkdir(path.c_str(), 0777) == -1)
             throw SysError(format("creating directory `%1%'") % path);
         created.push_back(path);
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index d75002b021..d52ab3e4d9 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -12,6 +12,10 @@
 namespace nix {
 
 
+#define foreach(it_type, it, collection)                                \
+    for (it_type it = collection.begin(); it != collection.end(); ++it)
+
+
 /* Return an environment variable. */
 string getEnv(const string & key, const string & def = "");