diff options
| author | Kane York <kanepyork@gmail.com> | 2020-08-06T08·28-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-08-06T20·50+0000 |
| commit | a5dae62e85d9ff9db6c4088d64559d7bac713486 (patch) | |
| tree | e551ce79399e51dba895f95b8077c877cd94942a /third_party/nix/src/libstore/local-store.hh | |
| parent | 6a97206cebf17f15b5cfede556bcb3c259ce5154 (diff) | |
fix(3p/nix): Use SkipEmpty in all calls to absl::StrSplit r/1613
The behavior to return a list containing a single empty string when provided an empty string is a behavior that absl inherited from legacy code. However, the behavior expected by legacy code in Nix is the behavior provided by the SkipEmpty option. Switch all calls to use SkipEmpty, except for the call already using SkipWhitespace. See also commit 26a59482d2427f640893517f1b24dd650a5bd5da, with the partly-prophetic message: "there may be other places we need to fix this as well." Change-Id: I6e94856a12cfb1b7e4a3b4e221769ed446648861 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1687 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/nix/src/libstore/local-store.hh')
| -rw-r--r-- | third_party/nix/src/libstore/local-store.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/libstore/local-store.hh b/third_party/nix/src/libstore/local-store.hh index 7ad9de3a8a3e..731cf1764cf6 100644 --- a/third_party/nix/src/libstore/local-store.hh +++ b/third_party/nix/src/libstore/local-store.hh @@ -97,8 +97,8 @@ class LocalStore : public LocalFSStore { public: // Hack for build-remote.cc. // TODO(tazjin): remove this when we've got gRPC - PathSet locksHeld = - absl::StrSplit(getEnv("NIX_HELD_LOCKS"), absl::ByAnyChar(" \t\n\r")); + PathSet locksHeld = absl::StrSplit( + getEnv("NIX_HELD_LOCKS"), absl::ByAnyChar(" \t\n\r"), absl::SkipEmpty()); /* Initialise the local store, upgrading the schema if necessary. */ |