Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/libfetchers/path.cc
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,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
Expand All @@ -143,6 +144,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));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to check if this version actually used std::filesystem::path

>>>>>>> 314e9fbed (libfetchers: fix double quote in path printed in logger)

// FIXME: check whether access to 'path' is allowed.
auto storePath = store->maybeParseStorePath(absPath);
Expand Down
Loading