diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
commit | d9bbfe042e06df35c12e4b8f53bfb1889cba90bf (patch) | |
tree | 9f34077cd824e8955be4ed2b5f1a459aa8076489 /nix/libstore/globals.cc | |
parent | f87a7cc60e058d2e07560d0d602747b567d9dce4 (diff) | |
parent | 47f2168b6fabb105565526b2a1243eeeb13008fe (diff) | |
download | guix-patches-d9bbfe042e06df35c12e4b8f53bfb1889cba90bf.tar guix-patches-d9bbfe042e06df35c12e4b8f53bfb1889cba90bf.tar.gz |
Merge branch 'master' into core-updates
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; |