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

NIX_REMOTE_SYSTEMS: actually support multiple :-separated entries

Browse source 
Bug not reported in 6 years, but here you go.

Also it is safe to switch to normal concatStringsSep behavior
because tokenizeString does not produce empty items.
This commit is contained in:
Robert Hensing 2024-07-13 00:07:42 +02:00
parent 39878c8979
commit 3f37785afd
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/globals.cc
View file

@ -35,6 +35,8 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#include "strings.hh"
namespace nix { namespace nix {
@ -82,7 +84,7 @@ Settings::Settings()
Strings ss; Strings ss;
for (auto & p : tokenizeString<Strings>(*s, ":")) for (auto & p : tokenizeString<Strings>(*s, ":"))
ss.push_back("@" + p); ss.push_back("@" + p);
builders = dropEmptyInitThenConcatStringsSep(" ", ss); builders = concatStringsSep("\n", ss);
} }
#if defined(__linux__) && defined(SANDBOX_SHELL) #if defined(__linux__) && defined(SANDBOX_SHELL)