mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-env -qa --json: Generate valid JSON even if there are invalid meta attrs

Browse source
This commit is contained in:
Eelco Dolstra 2014-06-02 17:58:43 +02:00
parent ceed819284
commit 3c6b8a5215
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nix-env/nix-env.cc
View file

@ -882,9 +882,10 @@ static void queryJSON(Globals & globals, vector<DrvInfo> & elems)
foreach (StringSet::iterator, j, metaNames) { foreach (StringSet::iterator, j, metaNames) {
metaObj.attr(*j); metaObj.attr(*j);
Value * v = i->queryMeta(*j); Value * v = i->queryMeta(*j);
if (!v) if (!v) {
printMsg(lvlError, format("derivation `%1%' has invalid meta attribute `%2%'") % i->name % *j); printMsg(lvlError, format("derivation `%1%' has invalid meta attribute `%2%'") % i->name % *j);
else { cout << "null";
} else {
PathSet context; PathSet context;
printValueAsJSON(globals.state, true, *v, cout, context); printValueAsJSON(globals.state, true, *v, cout, context);
} }