moraxyc/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* nix-store --optimise: flag "--dry-run" to just query what the disk

Browse source 
savings would be.
This commit is contained in:
Eelco Dolstra 2007-10-10 13:43:04 +00:00
parent a8629de827
commit 315183f194
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/libstore/local-store.cc
View file

@ -1016,25 +1016,30 @@ static void hashAndLink(bool dryRun, HashToPath & hashToPath,
return; 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 tempLink = (format("%1%.tmp-%2%-%3%")
% path % getpid() % rand()).str(); % path % getpid() % rand()).str();
toggleWritable(dirOf(path), true); toggleWritable(dirOf(path), true);
if (link(prevPath.first.c_str(), tempLink.c_str()) == -1) if (link(prevPath.first.c_str(), tempLink.c_str()) == -1)
throw SysError(format("cannot link `%1%' to `%2%'") throw SysError(format("cannot link `%1%' to `%2%'")
% tempLink % prevPath.first); % tempLink % prevPath.first);
/* Atomically replace the old file with the new hard link. */ /* Atomically replace the old file with the new hard link. */
if (rename(tempLink.c_str(), path.c_str()) == -1) if (rename(tempLink.c_str(), path.c_str()) == -1)
throw SysError(format("cannot rename `%1%' to `%2%'") throw SysError(format("cannot rename `%1%' to `%2%'")
% tempLink % path); % tempLink % path);
/* Make the directory read-only again and reset its timestamp /* Make the directory read-only again and reset its
back to 0. */ timestamp back to 0. */
_canonicalisePathMetaData(dirOf(path), false); _canonicalisePathMetaData(dirOf(path), false);
} else
printMsg(lvlTalkative, format("would link `%1%' to `%2%'") % path % prevPath.first);
stats.filesLinked++; stats.filesLinked++;
stats.bytesFreed += st.st_size; stats.bytesFreed += st.st_size;

7
src/nix-store/nix-store.cc
View file

@ -640,16 +640,19 @@ static void opOptimise(Strings opFlags, Strings opArgs)
if (!opArgs.empty()) if (!opArgs.empty())
throw UsageError("no arguments expected"); throw UsageError("no arguments expected");
bool dryRun = false;
for (Strings::iterator i = opFlags.begin(); for (Strings::iterator i = opFlags.begin();
i != opFlags.end(); ++i) i != opFlags.end(); ++i)
throw UsageError(format("unknown flag `%1%'") % *i); if (*i == "--dry-run") dryRun = true;
else throw UsageError(format("unknown flag `%1%'") % *i);
LocalStore * store2(dynamic_cast<LocalStore *>(store.get())); LocalStore * store2(dynamic_cast<LocalStore *>(store.get()));
if (!store2) throw Error("you don't have sufficient rights to use --optimise"); if (!store2) throw Error("you don't have sufficient rights to use --optimise");
OptimiseStats stats; OptimiseStats stats;
try { try {
store2->optimiseStore(true, stats); store2->optimiseStore(dryRun, stats);
} catch (...) { } catch (...) {
showOptimiseStats(stats); showOptimiseStats(stats);
throw; throw;