From 15ddeff532b517843668eef8f615838d15b4f75c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 4 Jan 2015 23:27:34 +0100
Subject: Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch
 'nix'.

---
 nix/libutil/util.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nix/libutil/util.cc')

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);
 }
 
 
-- 
cgit v1.2.3