From 315183f194881591480d9acd1eef685d6b64d7f8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Oct 2007 13:43:04 +0000 Subject: * nix-store --optimise: flag "--dry-run" to just query what the disk savings would be. --- src/libstore/local-store.cc | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'src/libstore') diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index c77ab3c6c..9a85c48d9 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1016,25 +1016,30 @@ static void hashAndLink(bool dryRun, HashToPath & hashToPath, return; } - printMsg(lvlTalkative, format("linking `%1%' to `%2%'") % path % prevPath.first); + if (!dryRun) { + + printMsg(lvlTalkative, format("linking `%1%' to `%2%'") % path % prevPath.first); - Path tempLink = (format("%1%.tmp-%2%-%3%") - % path % getpid() % rand()).str(); + Path tempLink = (format("%1%.tmp-%2%-%3%") + % path % getpid() % rand()).str(); - toggleWritable(dirOf(path), true); + toggleWritable(dirOf(path), true); - if (link(prevPath.first.c_str(), tempLink.c_str()) == -1) - throw SysError(format("cannot link `%1%' to `%2%'") - % tempLink % prevPath.first); - - /* Atomically replace the old file with the new hard link. */ - if (rename(tempLink.c_str(), path.c_str()) == -1) - throw SysError(format("cannot rename `%1%' to `%2%'") - % tempLink % path); - - /* Make the directory read-only again and reset its timestamp - back to 0. */ - _canonicalisePathMetaData(dirOf(path), false); + if (link(prevPath.first.c_str(), tempLink.c_str()) == -1) + throw SysError(format("cannot link `%1%' to `%2%'") + % tempLink % prevPath.first); + + /* Atomically replace the old file with the new hard link. */ + if (rename(tempLink.c_str(), path.c_str()) == -1) + throw SysError(format("cannot rename `%1%' to `%2%'") + % tempLink % path); + + /* Make the directory read-only again and reset its + timestamp back to 0. */ + _canonicalisePathMetaData(dirOf(path), false); + + } else + printMsg(lvlTalkative, format("would link `%1%' to `%2%'") % path % prevPath.first); stats.filesLinked++; stats.bytesFreed += st.st_size; -- cgit v1.2.3