#
# patch "ChangeLog"
#  from [b578859b791f4f44359fd202ebbcf2d0c18105d8]
#    to [44931b22575035c6c90eb0095f20991e37773e81]
#
# patch "database.cc"
#  from [b5fca6388cdb1741ca3301902e88de4ed04d5434]
#    to [81d3130bb8d0faacc945857b50f142470b88f2c3]
#
========================================================================
--- ChangeLog	b578859b791f4f44359fd202ebbcf2d0c18105d8
+++ ChangeLog	44931b22575035c6c90eb0095f20991e37773e81
@@ -1,5 +1,9 @@
 2005-08-24  Benoît Dejean  <address@hidden>

+	* database.cc (assert_sqlite3_ok): Somehow merged error messages.
+
+2005-08-24  Benoît Dejean  <address@hidden>
+
 	* change_set.cc (move_files_to_tmp_bottom_up): Better strings.
 	* keys.cc (generate_key_pair): Merged 2 strings.

========================================================================
--- database.cc	b5fca6388cdb1741ca3301902e88de4ed04d5434
+++ database.cc	81d3130bb8d0faacc945857b50f142470b88f2c3
@@ -173,7 +173,7 @@
       // first log the code so we can find _out_ what the confusing code
       // was... note that code does not uniquely identify the errmsg, unlike
       // errno's.
-      L(F("got sqlite error: %d: %s") % errcode % errmsg);
+      L(F("sqlite error: %d: %s") % errcode % errmsg);
     }
   std::string auxiliary_message = "";
   if (errcode == SQLITE_ERROR)
@@ -182,7 +182,10 @@
     }
   // if the last message is empty, the \n will be stripped off too
   E(errcode == SQLITE_OK,
-    F("sqlite error: %s\n%s") % errmsg % auxiliary_message);
+    // kind of string surgery to avoid ~duplicate strings
+    boost::format("%s\n%s")
+                  % (F("sqlite error: %d: %s") % errcode % errmsg).str()
+                  % auxiliary_message);
 }

 struct sqlite3 *