diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
| commit | 651478aa18a3f575d3b4cc14166a15a1c45b0f61 (patch) | |
| tree | 87c27dc9eff3d321f7ad4a622b110c517856a104 /nix/libstore/globals.cc | |
| parent | 71c08ee60bb3f62bac0614888fb62405f7a388ab (diff) | |
| parent | 9a2e5fe5fdcc6ea848ceeefa0f70147dfb360639 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'nix/libstore/globals.cc')
| -rw-r--r-- | nix/libstore/globals.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 69f6d06563..6df20e7a52 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -196,7 +196,7 @@ string Settings::pack() if (i->first.find('\n') != string::npos || i->first.find('=') != string::npos || i->second.find('\n') != string::npos) - throw Error("illegal option name/value"); + throw Error("invalid option name/value"); s += i->first; s += '='; s += i->second; s += '\n'; } return s; |