From 56294dd1f6125a12659972cf5a27b7335119c313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Mar 2025 16:04:04 +0100 Subject: [PATCH] libfetchers: fix double quote in path printed in logger (cherry picked from commit 314e9fbeda73b7af7149d304fb04e6fb5426f05c) # Conflicts: # src/libfetchers/path.cc --- src/libfetchers/path.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc index e255dd228..465602a67 100644 --- a/src/libfetchers/path.cc +++ b/src/libfetchers/path.cc @@ -127,6 +127,7 @@ struct PathInputScheme : InputScheme if (!input.parent) throw Error("cannot fetch input '%s' because it uses a relative path", input.to_string()); +<<<<<<< HEAD auto parent = canonPath(*input.parent); // the path isn't relative, prefix it @@ -142,6 +143,9 @@ struct PathInputScheme : InputScheme absPath = path; Activity act(*logger, lvlTalkative, actUnknown, fmt("copying '%s'", absPath)); +======= + Activity act(*logger, lvlTalkative, actUnknown, fmt("copying %s to the store", absPath)); +>>>>>>> 314e9fbed (libfetchers: fix double quote in path printed in logger) // FIXME: check whether access to 'path' is allowed. auto storePath = store->maybeParseStorePath(absPath);