picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

exportReferencesGraph: Only export in JSON format when in structured mode

Browse source 
This prevents breaking compatibility with builders that read
"closure.*", since they would accidentally pick up the new JSON files.
This commit is contained in:
Eelco Dolstra 2017-02-02 12:20:28 +01:00
parent 7a65b2470e
commit 1351b0df87
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libstore/build.cc
View file

@ -2276,18 +2276,24 @@ void DerivationGoal::doExportReferencesGraph()
}
}
/* Write closure info to <fileName>. */
writeFile(tmpDir + "/" + fileName,
worker.store.makeValidityRegistration(paths, false, false));
if (!drv->env.count("__json")) {
/* Write closure info to <fileName>. */
writeFile(tmpDir + "/" + fileName,
worker.store.makeValidityRegistration(paths, false, false));
} else {
/* Write a more comprehensive JSON serialisation to
<fileName>. */
std::ostringstream str;
{
JSONPlaceholder jsonRoot(str, true);
worker.store.pathInfoToJSON(jsonRoot, paths, false, true);
}
writeFile(tmpDir + "/" + fileName, str.str());
/* Write a more comprehensive JSON serialisation to
<fileName>.json. */
std::ostringstream str;
{
JSONPlaceholder jsonRoot(str, true);
worker.store.pathInfoToJSON(jsonRoot, paths, false, true);
}
writeFile(tmpDir + "/" + fileName + ".json", str.str());
}
}