From 907564463121febd50498101ffd3e0674d925ba5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Feb 2022 13:14:54 +0100 Subject: [PATCH] Remove debug messages --- src/libexpr/eval.cc | 1 - src/libexpr/paths.cc | 3 --- src/libfetchers/input-accessor.cc | 5 ----- 3 files changed, 9 deletions(-) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 304cb95f1..632ed867d 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -2066,7 +2066,6 @@ std::string EvalState::copyPathToStore(PathSet & context, const Path & path) dstPath = store->printStorePath(i->second); else { // FIXME: use SourcePath - printError("COPY %s", path); auto path2 = unpackPath(path); #if 0 auto p = settings.readOnlyMode diff --git a/src/libexpr/paths.cc b/src/libexpr/paths.cc index d2dcfb877..16f747586 100644 --- a/src/libexpr/paths.cc +++ b/src/libexpr/paths.cc @@ -8,7 +8,6 @@ static constexpr std::string_view marker = "/__virtual/"; Path EvalState::packPath(const SourcePath & path) { // FIXME: canonPath(path) ? - printError("PACK %s", path.path); assert(hasPrefix(path.path, "/")); inputAccessors.emplace(path.accessor->number, path.accessor); 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) { - printError("UNPACK %s", path); if (hasPrefix(path, marker)) { auto s = path.substr(marker.size()); auto slash = s.find('/'); @@ -32,7 +30,6 @@ SourcePath EvalState::unpackPath(const Path & path) SourcePath EvalState::rootPath(const Path & path) { - printError("ROOT %s", path); return {rootFS, path}; } diff --git a/src/libfetchers/input-accessor.cc b/src/libfetchers/input-accessor.cc index be63a447e..ab78e7297 100644 --- a/src/libfetchers/input-accessor.cc +++ b/src/libfetchers/input-accessor.cc @@ -107,7 +107,6 @@ struct FSInputAccessor : InputAccessor std::string readFile(PathView path) override { auto absPath = makeAbsPath(path); - printError("READ %s", absPath); checkAllowed(absPath); return nix::readFile(absPath); } @@ -115,14 +114,12 @@ struct FSInputAccessor : InputAccessor bool pathExists(PathView path) override { auto absPath = makeAbsPath(path); - printError("EXISTS %s", absPath); return isAllowed(absPath) && nix::pathExists(absPath); } Stat lstat(PathView path) override { auto absPath = makeAbsPath(path); - printError("LSTAT %s", absPath); checkAllowed(absPath); auto st = nix::lstat(absPath); return Stat { @@ -138,7 +135,6 @@ struct FSInputAccessor : InputAccessor DirEntries readDirectory(PathView path) override { auto absPath = makeAbsPath(path); - printError("READDIR %s", absPath); checkAllowed(absPath); DirEntries res; for (auto & entry : nix::readDirectory(absPath)) { @@ -157,7 +153,6 @@ struct FSInputAccessor : InputAccessor std::string readLink(PathView path) override { auto absPath = makeAbsPath(path); - printError("READLINK %s", absPath); checkAllowed(absPath); return nix::readLink(absPath); }