Merge remote-tracking branch 'origin/master' into flakes

2019-10-10 15:07:59 +02:00
parent 90df25ef7e 95cf23ee7c
commit 5446eae949
1 changed files with 2 additions and 2 deletions
@@ -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) {