diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-10-10 15:07:59 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-10-10 15:07:59 +0200 |
| commit | 5446eae94987193add457cda39f48e6a6a42f629 (patch) | |
| tree | 00fbf3c6599bb477d84da97a7a20abd4382cbc10 | |
| parent | 90df25ef7eb5157868a744906eaf6401430bb93d (diff) | |
| parent | 95cf23ee7c5b0fd69b21811989a5668f4261fd51 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
| -rw-r--r-- | src/nix/verify.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 81abf434f..6a3d26bf9 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -13,7 +13,7 @@ struct CmdVerify : StorePathsCommand bool noContents = false; bool noTrust = false; Strings substituterUris; - size_t sigsNeeded; + size_t sigsNeeded = 0; CmdVerify() { @@ -108,7 +108,7 @@ struct CmdVerify : StorePathsCommand else { StringSet sigsSeen; - size_t actualSigsNeeded = sigsNeeded ? sigsNeeded : 1; + size_t actualSigsNeeded = std::max(sigsNeeded, (size_t) 1); size_t validSigs = 0; auto doSigs = [&](StringSet sigs) { |