wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-04 03:01:47 +02:00
Code Activity

dropEmptyInitThenConcatStringsSep -> concatStringSep: diag

Browse source
This commit is contained in:
Robert Hensing 2024-07-13 00:13:58 +02:00
parent 75dde71ff9
commit 608a425550
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/misc.cc
View file

@ -465,7 +465,7 @@ OutputPathMap resolveDerivedPath(Store & store, const DerivedPath::Built & bfd)
if (!outputsLeft.empty())
throw Error("derivation '%s' does not have an outputs %s",
store.printStorePath(drvPath),
dropEmptyInitThenConcatStringsSep(", ", quoteStrings(std::get<OutputsSpec::Names>(bfd.outputs.raw))));
concatStringsSep(", ", quoteStrings(std::get<OutputsSpec::Names>(bfd.outputs.raw))));
return outputMap;
}

6
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -64,6 +64,8 @@
#include <grp.h>
#include <iostream>
#include "strings.hh"
namespace nix {
void handleDiffHook(
@ -840,7 +842,7 @@ void LocalDerivationGoal::startBuilder()
/* Run the builder. */
printMsg(lvlChatty, "executing builder '%1%'", drv->builder);
printMsg(lvlChatty, "using builder args '%1%'", dropEmptyInitThenConcatStringsSep(" ", drv->args));
printMsg(lvlChatty, "using builder args '%1%'", concatStringsSep(" ", drv->args));
for (auto & i : drv->env)
printMsg(lvlVomit, "setting builder env variable '%1%'='%2%'", i.first, i.second);
@ -1063,7 +1065,7 @@ void LocalDerivationGoal::startBuilder()
e.addTrace({}, "while waiting for the build environment for '%s' to initialize (%s, previous messages: %s)",
worker.store.printStorePath(drvPath),
statusToString(status),
dropEmptyInitThenConcatStringsSep("|", msgs));
concatStringsSep("|", msgs));
throw;
}
}();