diff options
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/command.cc | 2 | ||||
-rw-r--r-- | src/nix/copy.cc | 4 | ||||
-rw-r--r-- | src/nix/sigs.cc | 2 | ||||
-rw-r--r-- | src/nix/verify.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/nix/command.cc b/src/nix/command.cc index 37534015b89f..fdf6ae6affaf 100644 --- a/src/nix/command.cc +++ b/src/nix/command.cc @@ -81,7 +81,7 @@ StoreCommand::StoreCommand() void StoreCommand::run() { - run(openStoreAt(storeUri)); + run(openStore(storeUri)); } StorePathsCommand::StorePathsCommand() diff --git a/src/nix/copy.cc b/src/nix/copy.cc index de306cbf91d9..e8317dc393fd 100644 --- a/src/nix/copy.cc +++ b/src/nix/copy.cc @@ -43,8 +43,8 @@ struct CmdCopy : StorePathsCommand if (srcUri.empty() && dstUri.empty()) throw UsageError("you must pass ‘--from’ and/or ‘--to’"); - ref<Store> srcStore = srcUri.empty() ? store : openStoreAt(srcUri); - ref<Store> dstStore = dstUri.empty() ? store : openStoreAt(dstUri); + ref<Store> srcStore = srcUri.empty() ? store : openStore(srcUri); + ref<Store> dstStore = dstUri.empty() ? store : openStore(dstUri); std::string copiedLabel = "copied"; diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index 0ff1b9f7cea0..d8d8c0f53df0 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -35,7 +35,7 @@ struct CmdCopySigs : StorePathsCommand // FIXME: factor out commonality with MixVerify. std::vector<ref<Store>> substituters; for (auto & s : substituterUris) - substituters.push_back(openStoreAt(s)); + substituters.push_back(openStore(s)); ThreadPool pool; diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 5314a42a46c7..2f8d02fa060e 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -52,7 +52,7 @@ struct CmdVerify : StorePathsCommand { std::vector<ref<Store>> substituters; for (auto & s : substituterUris) - substituters.push_back(openStoreAt(s)); + substituters.push_back(openStore(s)); auto publicKeys = getDefaultPublicKeys(); |