nix verify: Show correct path when using --all on a binary cache

2020-07-13 20:12:44 +02:00
parent 7c2fef0a81
commit 9502c0e2eb
1 changed files with 5 additions and 2 deletions
@@ -77,13 +77,16 @@ struct CmdVerify : StorePathsCommand
            try {
                checkInterrupt();

-                Activity act2(*logger, lvlInfo, actUnknown, fmt("checking '%s'", storePath));
-
                MaintainCount<std::atomic<size_t>> mcActive(active);
                update();

                auto info = store->queryPathInfo(store->parseStorePath(storePath));

+                // Note: info->path can be different from storePath
+                // for binary cache stores when using --all (since we
+                // can't enumerate names efficiently).
+                Activity act2(*logger, lvlInfo, actUnknown, fmt("checking '%s'", store->printStorePath(info->path)));
+
                if (!noContents) {

                    std::unique_ptr<AbstractHashSink> hashSink;