alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Unify "nix verify-paths" and "nix verify-store"

Browse source 
"verify-store" is now simply an "--all" flag to "nix verify". This
flag can be used for any other store path command as well (e.g. "nix
path-info", "nix copy-sigs", ...).
This commit is contained in:
Eelco Dolstra 2016-04-14 21:14:29 +02:00
parent 327569035c
commit 99851c6f06
3 changed files with 31 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nix/command.cc
View file

@ -73,18 +73,28 @@ StorePathsCommand::StorePathsCommand()
{
expectArgs("paths", &storePaths);
mkFlag('r', "recursive", "apply operation to closure of the specified paths", &recursive);
mkFlag(0, "all", "apply operation to the entire store", &all);
}
void StorePathsCommand::run(ref<Store> store)
{
for (auto & storePath : storePaths)
storePath = followLinksToStorePath(storePath);
if (all) {
if (storePaths.size())
throw UsageError("‘--all’ does not expect arguments");
for (auto & p : store->queryAllValidPaths())
storePaths.push_back(p);
}
if (recursive) {
PathSet closure;
else {
for (auto & storePath : storePaths)
store->computeFSClosure(storePath, closure, false, false);
storePaths = store->topoSortPaths(closure);
storePath = followLinksToStorePath(storePath);
if (recursive) {
PathSet closure;
for (auto & storePath : storePaths)
store->computeFSClosure(storePath, closure, false, false);
storePaths = store->topoSortPaths(closure);
}
}
run(store, storePaths);

1
src/nix/command.hh
View file

@ -31,6 +31,7 @@ private:
Paths storePaths;
bool recursive = false;
bool all = false;
public:

68
src/nix/verify.cc
View file

@ -10,14 +10,14 @@
using namespace nix;
struct MixVerify : virtual Args
struct CmdVerify : StorePathsCommand
{
bool noContents = false;
bool noTrust = false;
Strings substituterUris;
size_t sigsNeeded;
MixVerify()
CmdVerify()
{
mkFlag(0, "no-contents", "do not verify the contents of each store path", &noContents);
mkFlag(0, "no-trust", "do not verify whether each store path is trusted", &noTrust);
@ -26,7 +26,17 @@ struct MixVerify : virtual Args
mkIntFlag('n', "sigs-needed", "require that each path has at least N valid signatures", &sigsNeeded);
}
void verifyPaths(ref<Store> store, const Paths & storePaths)
std::string name() override
{
return "verify";
}
std::string description() override
{
return "verify the integrity of store paths";
}
void run(ref<Store> store, Paths storePaths) override
{
restoreAffinity(); // FIXME
@ -158,54 +168,4 @@ struct MixVerify : virtual Args
}
};
struct CmdVerifyPaths : StorePathsCommand, MixVerify
{
CmdVerifyPaths()
{
}
std::string name() override
{
return "verify-paths";
}
std::string description() override
{
return "verify the integrity of store paths";
}
void run(ref<Store> store, Paths storePaths) override
{
verifyPaths(store, storePaths);
}
};
static RegisterCommand r1(make_ref<CmdVerifyPaths>());
struct CmdVerifyStore : StoreCommand, MixVerify
{
CmdVerifyStore()
{
}
std::string name() override
{
return "verify-store";
}
std::string description() override
{
return "verify the integrity of all paths in the Nix store";
}
void run(ref<Store> store) override
{
// FIXME: use store->verifyStore()?
PathSet validPaths = store->queryAllValidPaths();
verifyPaths(store, Paths(validPaths.begin(), validPaths.end()));
}
};
static RegisterCommand r2(make_ref<CmdVerifyStore>());
static RegisterCommand r1(make_ref<CmdVerify>());