nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-27 12:41:00 +01:00
Code Activity

Fixes to decodeValidPathInfo and cleanups

Browse source
This commit is contained in:
Wouter den Breejen 2007-10-08 12:24:02 +00:00
parent dacf2e0e87
commit 13b632ca57
3 changed files with 22 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libstore/build.cc
View file

@ -1096,17 +1096,36 @@ static string makeValidityRegistration(const PathSet & paths,
for (PathSet::iterator i = paths.begin(); i != paths.end(); ++i) {
s += *i + "\n";
Path deriver = showDerivers ? store->queryDeriver(*i) : "";
Path deriver = showDerivers ? store->queryDeriver(*i) : ""; //TODO HOW ABOUT MULTIPLE STATE-STORE DERIVERS? take last one ??!!
s += deriver + "\n";
//store references
PathSet references;
store->queryStoreReferences(*i, references, 0); //TODO check if this is ok
store->queryStoreReferences(*i, references, 0);
s += (format("%1%\n") % references.size()).str();
for (PathSet::iterator j = references.begin();
j != references.end(); ++j)
s += *j + "\n";
//state references
PathSet stateReferences;
store->queryStateReferences(*i, stateReferences, 0);
s += (format("%1%\n") % stateReferences.size()).str();
for (PathSet::iterator j = stateReferences.begin();
j != stateReferences.end(); ++j)
s += *j + "\n";
//revision
string revision = unsignedInt2String(0);
s += revision + "\n";
}
return s;
@ -2495,7 +2514,7 @@ void Worker::getInfo()
std::istringstream str(res);
while (true) {
ValidPathInfo info = decodeValidPathInfo(str);
ValidPathInfo info = decodeValidPathInfo(str); //TODO Test is this is ok with the state-brand extension to struct ValidPath
if (info.path == "") break;
/* !!! inefficient */