diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
| commit | 23800e47361304682914314b99cfd4f3926f28e3 (patch) | |
| tree | e67d984ab5961a81c8b8c6396c79cb218fecda85 /nix/libutil/util.cc | |
| parent | 9b1bf33081652210502c6ef34506e27a9bc60f06 (diff) | |
| parent | aebb05b09502be00fb121f9c6cd74a190fb12a1c (diff) | |
| download | guix-patches-23800e47361304682914314b99cfd4f3926f28e3.tar guix-patches-23800e47361304682914314b99cfd4f3926f28e3.tar.gz | |
Merge branch 'master' into core-updates
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); } |