mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-11 00:36:20 +02:00
Remove debug messages
This commit is contained in:
parent
006d862d30
commit
9075644631
3 changed files with 0 additions and 9 deletions
|
@ -2066,7 +2066,6 @@ std::string EvalState::copyPathToStore(PathSet & context, const Path & path)
|
||||||
dstPath = store->printStorePath(i->second);
|
dstPath = store->printStorePath(i->second);
|
||||||
else {
|
else {
|
||||||
// FIXME: use SourcePath
|
// FIXME: use SourcePath
|
||||||
printError("COPY %s", path);
|
|
||||||
auto path2 = unpackPath(path);
|
auto path2 = unpackPath(path);
|
||||||
#if 0
|
#if 0
|
||||||
auto p = settings.readOnlyMode
|
auto p = settings.readOnlyMode
|
||||||
|
|
|
@ -8,7 +8,6 @@ static constexpr std::string_view marker = "/__virtual/";
|
||||||
Path EvalState::packPath(const SourcePath & path)
|
Path EvalState::packPath(const SourcePath & path)
|
||||||
{
|
{
|
||||||
// FIXME: canonPath(path) ?
|
// FIXME: canonPath(path) ?
|
||||||
printError("PACK %s", path.path);
|
|
||||||
assert(hasPrefix(path.path, "/"));
|
assert(hasPrefix(path.path, "/"));
|
||||||
inputAccessors.emplace(path.accessor->number, path.accessor);
|
inputAccessors.emplace(path.accessor->number, path.accessor);
|
||||||
return std::string(marker) + std::to_string(path.accessor->number) + path.path;
|
return std::string(marker) + std::to_string(path.accessor->number) + path.path;
|
||||||
|
@ -16,7 +15,6 @@ Path EvalState::packPath(const SourcePath & path)
|
||||||
|
|
||||||
SourcePath EvalState::unpackPath(const Path & path)
|
SourcePath EvalState::unpackPath(const Path & path)
|
||||||
{
|
{
|
||||||
printError("UNPACK %s", path);
|
|
||||||
if (hasPrefix(path, marker)) {
|
if (hasPrefix(path, marker)) {
|
||||||
auto s = path.substr(marker.size());
|
auto s = path.substr(marker.size());
|
||||||
auto slash = s.find('/');
|
auto slash = s.find('/');
|
||||||
|
@ -32,7 +30,6 @@ SourcePath EvalState::unpackPath(const Path & path)
|
||||||
|
|
||||||
SourcePath EvalState::rootPath(const Path & path)
|
SourcePath EvalState::rootPath(const Path & path)
|
||||||
{
|
{
|
||||||
printError("ROOT %s", path);
|
|
||||||
return {rootFS, path};
|
return {rootFS, path};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,6 @@ struct FSInputAccessor : InputAccessor
|
||||||
std::string readFile(PathView path) override
|
std::string readFile(PathView path) override
|
||||||
{
|
{
|
||||||
auto absPath = makeAbsPath(path);
|
auto absPath = makeAbsPath(path);
|
||||||
printError("READ %s", absPath);
|
|
||||||
checkAllowed(absPath);
|
checkAllowed(absPath);
|
||||||
return nix::readFile(absPath);
|
return nix::readFile(absPath);
|
||||||
}
|
}
|
||||||
|
@ -115,14 +114,12 @@ struct FSInputAccessor : InputAccessor
|
||||||
bool pathExists(PathView path) override
|
bool pathExists(PathView path) override
|
||||||
{
|
{
|
||||||
auto absPath = makeAbsPath(path);
|
auto absPath = makeAbsPath(path);
|
||||||
printError("EXISTS %s", absPath);
|
|
||||||
return isAllowed(absPath) && nix::pathExists(absPath);
|
return isAllowed(absPath) && nix::pathExists(absPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
Stat lstat(PathView path) override
|
Stat lstat(PathView path) override
|
||||||
{
|
{
|
||||||
auto absPath = makeAbsPath(path);
|
auto absPath = makeAbsPath(path);
|
||||||
printError("LSTAT %s", absPath);
|
|
||||||
checkAllowed(absPath);
|
checkAllowed(absPath);
|
||||||
auto st = nix::lstat(absPath);
|
auto st = nix::lstat(absPath);
|
||||||
return Stat {
|
return Stat {
|
||||||
|
@ -138,7 +135,6 @@ struct FSInputAccessor : InputAccessor
|
||||||
DirEntries readDirectory(PathView path) override
|
DirEntries readDirectory(PathView path) override
|
||||||
{
|
{
|
||||||
auto absPath = makeAbsPath(path);
|
auto absPath = makeAbsPath(path);
|
||||||
printError("READDIR %s", absPath);
|
|
||||||
checkAllowed(absPath);
|
checkAllowed(absPath);
|
||||||
DirEntries res;
|
DirEntries res;
|
||||||
for (auto & entry : nix::readDirectory(absPath)) {
|
for (auto & entry : nix::readDirectory(absPath)) {
|
||||||
|
@ -157,7 +153,6 @@ struct FSInputAccessor : InputAccessor
|
||||||
std::string readLink(PathView path) override
|
std::string readLink(PathView path) override
|
||||||
{
|
{
|
||||||
auto absPath = makeAbsPath(path);
|
auto absPath = makeAbsPath(path);
|
||||||
printError("READLINK %s", absPath);
|
|
||||||
checkAllowed(absPath);
|
checkAllowed(absPath);
|
||||||
return nix::readLink(absPath);
|
return nix::readLink(absPath);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue