ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Avoid trailing slash that broke lookup

Browse Source
This commit is contained in:
John Ericson 2024-10-07 11:43:58 -04:00
parent ceb8b48cce
commit 750275d6e8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hydra-queue-runner/nar-extractor.cc
View File

@ -54,7 +54,15 @@ struct Extractor : FileSystemObjectSink
}; };
NarMemberDatas & members; NarMemberDatas & members;
Path prefix; std::filesystem::path prefix;
Path toKey(const CanonPath & path)
{
std::filesystem::path p = prefix;
// Conditional to avoid trailing slash
if (!path.isRoot()) p /= path.rel();
return p;
}
Extractor(NarMemberDatas & members, const Path & prefix) Extractor(NarMemberDatas & members, const Path & prefix)
: members(members), prefix(prefix) : members(members), prefix(prefix)
@ -62,13 +70,13 @@ struct Extractor : FileSystemObjectSink
void createDirectory(const CanonPath & path) override void createDirectory(const CanonPath & path) override
{ {
members.insert_or_assign(prefix + path.abs(), NarMemberData { .type = SourceAccessor::Type::tDirectory }); members.insert_or_assign(toKey(path), NarMemberData { .type = SourceAccessor::Type::tDirectory });
} }
void createRegularFile(const CanonPath & path, std::function<void(CreateRegularFileSink &)> func) override void createRegularFile(const CanonPath & path, std::function<void(CreateRegularFileSink &)> func) override
{ {
NarMemberConstructor nmc { NarMemberConstructor nmc {
members.insert_or_assign(prefix + path.abs(), NarMemberData { members.insert_or_assign(toKey(path), NarMemberData {
.type = SourceAccessor::Type::tRegular, .type = SourceAccessor::Type::tRegular,
.fileSize = 0, .fileSize = 0,
.contents = filesToKeep.count(path.abs()) ? std::optional("") : std::nullopt, .contents = filesToKeep.count(path.abs()) ? std::optional("") : std::nullopt,
@ -79,7 +87,7 @@ struct Extractor : FileSystemObjectSink
void createSymlink(const CanonPath & path, const std::string & target) override void createSymlink(const CanonPath & path, const std::string & target) override
{ {
members.insert_or_assign(prefix + path.abs(), NarMemberData { .type = SourceAccessor::Type::tSymlink }); members.insert_or_assign(toKey(path), NarMemberData { .type = SourceAccessor::Type::tSymlink });
} }
}; };