diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-04 23:27:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-04 23:27:34 +0100 |
| commit | 15ddeff532b517843668eef8f615838d15b4f75c (patch) | |
| tree | 2d11b350f4a83b28cf72e3ba37cfe218ac74f868 /nix/libutil/util.cc | |
| parent | 828c0bec6b95a6dcfffd28d0a28caecf4f69addf (diff) | |
| download | guix-patches-15ddeff532b517843668eef8f615838d15b4f75c.tar guix-patches-15ddeff532b517843668eef8f615838d15b4f75c.tar.gz | |
Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.
Diffstat (limited to 'nix/libutil/util.cc')
| -rw-r--r-- | nix/libutil/util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 15c462ce4e..846674a29d 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -1041,7 +1041,7 @@ void expect(std::istream & str, const string & s) char s2[s.size()]; str.read(s2, s.size()); if (string(s2, s.size()) != s) - throw Error(format("expected string `%1%'") % s); + throw FormatError(format("expected string `%1%'") % s); } |