Bug 1342441 - Improve the Wrong Sqlite Version message. r=asuth, a=jcristau
authorMarco Bonardo <mbonardo@mozilla.com>
Fri, 24 Feb 2017 17:39:30 +0100
changeset 367316 8cc717c3d1c7c2d2e2debedfe343fbea906b5554
parent 367315 c636ea5023467dc9ab240516d6f668c9cf79da74
child 367317 95d0c35c8c707b7a7f9c6b8b43f82addf32d0ee9
push id6983
push userryanvm@gmail.com
push dateMon, 27 Feb 2017 20:30:34 +0000
treeherdermozilla-beta@8cc717c3d1c7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersasuth, jcristau
bugs1342441
milestone52.0
Bug 1342441 - Improve the Wrong Sqlite Version message. r=asuth, a=jcristau CLOSED TREE MozReview-Commit-ID: FVFw9XjpzOb
storage/mozStorageService.cpp
--- a/storage/mozStorageService.cpp
+++ b/storage/mozStorageService.cpp
@@ -206,19 +206,21 @@ Service::getSingleton()
   // Ensure that we are using the same version of SQLite that we compiled with
   // or newer.  Our configure check ensures we are using a new enough version
   // at compile time.
   if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number()) {
     nsCOMPtr<nsIPromptService> ps(do_GetService(NS_PROMPTSERVICE_CONTRACTID));
     if (ps) {
       nsAutoString title, message;
       title.AppendLiteral("SQLite Version Error");
-      message.AppendLiteral("The application has been updated, but your version "
-                          "of SQLite is too old and the application cannot "
-                          "run.");
+      message.AppendLiteral("The application has been updated, but the SQLite "
+                            "library wasn't updated properly and the application "
+                            "cannot run. Please try to launch the application again. "
+                            "If that should still fail, please try reinstalling "
+                            "it, or visit https://support.mozilla.org/.");
       (void)ps->Alert(nullptr, title.get(), message.get());
     }
     MOZ_CRASH("SQLite Version Error");
   }
 
   // The first reference to the storage service must be obtained on the
   // main thread.
   NS_ENSURE_TRUE(NS_IsMainThread(), nullptr);