diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-11-22T15·06+0100 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-09-01T02·21+0000 |
| commit | 785cb3a75476033ba6eec2fef334d47d8e64388a (patch) | |
| tree | 676d53868e29e0ab28443b9d13019c54754012f7 /third_party/nix/src/libstore/ssh.cc | |
| parent | c5f3b12f0484cd1a5152b6c64a336e9852d7c484 (diff) | |
refactor(tvix): getEnv(): Return std::optional r/1756
This allows distinguishing between an empty value and no value. Patch ported from upstream at https://github.com/NixOS/nix/commit/ba87b08f8529e4d9f8c58d8c625152058ceadb75 Change-Id: I061cc8e16b1a7a0341adfc3b0edca1c0c51d5c97 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1884 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party/nix/src/libstore/ssh.cc')
| -rw-r--r-- | third_party/nix/src/libstore/ssh.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/libstore/ssh.cc b/third_party/nix/src/libstore/ssh.cc index 7d5fe6d10937..6043e584ddbe 100644 --- a/third_party/nix/src/libstore/ssh.cc +++ b/third_party/nix/src/libstore/ssh.cc @@ -22,8 +22,8 @@ SSHMaster::SSHMaster(const std::string& host, std::string keyFile, void SSHMaster::addCommonSSHOpts(Strings& args) { for (auto& i : - absl::StrSplit(getEnv("NIX_SSHOPTS"), absl::ByAnyChar(" \t\n\r"), - absl::SkipEmpty())) { + absl::StrSplit(getEnv("NIX_SSHOPTS").value_or(""), + absl::ByAnyChar(" \t\n\r"), absl::SkipEmpty())) { args.push_back(std::string(i)); } if (!keyFile.empty()) { |