From e514b3939adb087338a9ef7445afcecb0efb42b1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 9 May 2023 13:24:53 -0400 Subject: [PATCH] Add name to some error messages --- src/libstore/daemon.cc | 4 ++-- src/libstore/remote-store.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index 31e2e2af5..5083497a9 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -408,8 +408,8 @@ static void performOp(TunnelLogger * logger, ref store, return std::visit(overloaded { [&](const TextIngestionMethod &) { if (hashType != htSHA256) - throw UnimplementedError("Only SHA-256 is supported for adding text-hashed data, but '%1' was given", - printHashType(hashType)); + throw UnimplementedError("When adding text-hashed data called '%s', only SHA-256 is supported but '%s' was given", + name, printHashType(hashType)); // We could stream this by changing Store std::string contents = source.drain(); auto path = store->addTextToStore(name, contents, refs, repair); diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index b3f5251f2..0ed17a6ce 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -631,8 +631,8 @@ ref RemoteStore::addCAToStore( std::visit(overloaded { [&](const TextIngestionMethod & thm) -> void { if (hashType != htSHA256) - throw UnimplementedError("Only SHA-256 is supported for adding text-hashed data, but '%1' was given", - printHashType(hashType)); + throw UnimplementedError("When adding text-hashed data called '%s', only SHA-256 is supported but '%s' was given", + name, printHashType(hashType)); std::string s = dump.drain(); conn->to << wopAddTextToStore << name << s; worker_proto::write(*this, conn->to, references);