forked from lix-project/lix
Fold "nix query-path-sigs" into "nix path-info"
This commit is contained in:
parent
95abf9c402
commit
456179018a
src/nix
|
@ -12,11 +12,13 @@ struct CmdPathInfo : StorePathsCommand
|
||||||
{
|
{
|
||||||
bool showSize = false;
|
bool showSize = false;
|
||||||
bool showClosureSize = false;
|
bool showClosureSize = false;
|
||||||
|
bool showSigs = false;
|
||||||
|
|
||||||
CmdPathInfo()
|
CmdPathInfo()
|
||||||
{
|
{
|
||||||
mkFlag('s', "size", "print size of the NAR dump of each path", &showSize);
|
mkFlag('s', "size", "print size of the NAR dump of each path", &showSize);
|
||||||
mkFlag('S', "closure-size", "print sum size of the NAR dumps of the closure of each path", &showClosureSize);
|
mkFlag('S', "closure-size", "print sum size of the NAR dumps of the closure of each path", &showClosureSize);
|
||||||
|
mkFlag(0, "sigs", "show signatures", &showSigs);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string name() override
|
std::string name() override
|
||||||
|
@ -68,6 +70,14 @@ struct CmdPathInfo : StorePathsCommand
|
||||||
std::cout << '\t' << std::setw(11) << totalSize;
|
std::cout << '\t' << std::setw(11) << totalSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (showSigs) {
|
||||||
|
std::cout << '\t';
|
||||||
|
Strings ss;
|
||||||
|
if (info->ultimate) ss.push_back("ultimate");
|
||||||
|
for (auto & sig : info->sigs) ss.push_back(sig);
|
||||||
|
std::cout << concatStringsSep(" ", ss);
|
||||||
|
}
|
||||||
|
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,37 +103,6 @@ struct CmdCopySigs : StorePathsCommand
|
||||||
|
|
||||||
static RegisterCommand r1(make_ref<CmdCopySigs>());
|
static RegisterCommand r1(make_ref<CmdCopySigs>());
|
||||||
|
|
||||||
struct CmdQueryPathSigs : StorePathsCommand
|
|
||||||
{
|
|
||||||
CmdQueryPathSigs()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string name() override
|
|
||||||
{
|
|
||||||
return "query-path-sigs";
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string description() override
|
|
||||||
{
|
|
||||||
return "print store path signatures";
|
|
||||||
}
|
|
||||||
|
|
||||||
void run(ref<Store> store, Paths storePaths) override
|
|
||||||
{
|
|
||||||
for (auto & storePath : storePaths) {
|
|
||||||
auto info = store->queryPathInfo(storePath);
|
|
||||||
std::cout << storePath << " ";
|
|
||||||
if (info->ultimate) std::cout << "ultimate ";
|
|
||||||
for (auto & sig : info->sigs)
|
|
||||||
std::cout << sig << " ";
|
|
||||||
std::cout << "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
static RegisterCommand r2(make_ref<CmdQueryPathSigs>());
|
|
||||||
|
|
||||||
struct CmdSignPaths : StorePathsCommand
|
struct CmdSignPaths : StorePathsCommand
|
||||||
{
|
{
|
||||||
Path secretKeyFile;
|
Path secretKeyFile;
|
||||||
|
|
Loading…
Reference in a new issue