diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-03-14 19:01:22 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-03-14 19:24:04 +0100 |
| commit | ca14b142001ab467e679d4ed0cc6236180bf34b2 (patch) | |
| tree | b7d89f1b6703eea64dc3aa9e6f2f354c3cd9f0c3 /src/libstore/sqlite.cc | |
| parent | 56f2ed00813f49e2834076787f98438a976eebb1 (diff) | |
Use boost::format from the boost package
Note that this only requires headers from boost so it doesn't add a
runtime dependency.
Also, use Nixpkgs 18.03.
Diffstat (limited to 'src/libstore/sqlite.cc')
| -rw-r--r-- | src/libstore/sqlite.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc index b13001b06..42d40e71d 100644 --- a/src/libstore/sqlite.cc +++ b/src/libstore/sqlite.cc @@ -7,7 +7,7 @@ namespace nix { -[[noreturn]] void throwSQLiteError(sqlite3 * db, const format & f) +[[noreturn]] void throwSQLiteError(sqlite3 * db, const FormatOrString & fs) { int err = sqlite3_errcode(db); @@ -21,7 +21,7 @@ namespace nix { : fmt("SQLite database '%s' is busy", path)); } else - throw SQLiteError("%s: %s (in '%s')", f.str(), sqlite3_errstr(err), path); + throw SQLiteError("%s: %s (in '%s')", fs.s, sqlite3_errstr(err), path); } SQLite::SQLite(const Path & path) |