max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5883 from fzakaria/faridzakaria/check-meta

Browse source 
Check for `--meta` before emitting it for `--json`
This commit is contained in:
Théophane Hufschmitt 2022-01-11 16:57:28 +01:00 committed by GitHub
commit d023903b6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -907,7 +907,7 @@ static VersionDiff compareVersionAgainstSet(
}
static void queryJSON(Globals & globals, vector<DrvInfo> & elems, bool printOutPath)
static void queryJSON(Globals & globals, vector<DrvInfo> & elems, bool printOutPath, bool printMeta)
{
JSONObject topObj(cout, true);
for (auto & i : elems) {
@ -927,6 +927,7 @@ static void queryJSON(Globals & globals, vector<DrvInfo> & elems, bool printOutP
}
}
if (printMeta) {
JSONObject metaObj = pkgObj.object("meta");
StringSet metaNames = i.queryMetaNames();
for (auto & j : metaNames) {
@ -942,6 +943,7 @@ static void queryJSON(Globals & globals, vector<DrvInfo> & elems, bool printOutP
}
}
}
}
static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
@ -1043,7 +1045,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
/* Print the desired columns, or XML output. */
if (jsonOutput) {
queryJSON(globals, elems, printOutPath);
queryJSON(globals, elems, printOutPath, printMeta);
return;
}