From c6178f0b038097584cbbac970ebdb3772de27763 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Mar 2005 17:46:38 +0000 Subject: * Create missing log and temproots directories automatically (reported by Rob). --- src/libstore/gc.cc | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/libstore/gc.cc') diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index e1075d0251fd..7f0b07946700 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -43,16 +43,6 @@ static int openGCLock(LockType lockType) } -static void createDirs(const Path & path) -{ - if (path == "") return; - createDirs(dirOf(path)); - if (!pathExists(path)) - if (mkdir(path.c_str(), 0777) == -1) - throw SysError(format("creating directory `%1%'") % path); -} - - void createSymlink(const Path & link, const Path & target, bool careful) { /* Create directories up to `gcRoot'. */ @@ -122,8 +112,11 @@ void addTempRoot(const Path & path) if (fdTempRoots == -1) { while (1) { - fnTempRoots = (format("%1%/%2%/%3%") - % nixStateDir % tempRootsDir % getpid()).str(); + Path dir = (format("%1%/%2%") % nixStateDir % tempRootsDir).str(); + createDirs(dir); + + fnTempRoots = (format("%1%/%2%") + % dir % getpid()).str(); AutoCloseFD fdGCLock = openGCLock(ltRead); -- cgit 1.4.1