From e56af0080f95d40fc8635d37d9ebd12fbefdb092 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Mon, 5 Nov 2018 12:32:24 +0200
Subject: Remove 'Your install seems to be corrupted' messagebox

Messagebox is replaced with log. The critical messagebox is a bit harsh
as you can continue using the installer despite of the 'corrupted
install' message.
'Your install seems to be corrupted' can happen for number of reasons:
the installer for some reason was not able to write the needed information
to components.xml or maintenancetool.dat. Reason could be that the
installer was forcely interrupted or crashed during write, or the files
cannot be opened for write. 'Your install seems to be corrupted'
occurs if components.xml contains an element which has no operations in
maintenancetool.dat or vice versa. If you get an error
"Critical: Operations missing from installed packages
("missing.package.name"), remove the package from
components.xml to get rid of the log. Error: "Critical: Orphaned
operations("package.name")" you can ignore
Or you can install the package again if it is still found from
repositories.

Task-number: QTIFW-1003
Change-Id: I02c0a945ca3ce30ef4b0a80190d91638ab54c6bf
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 src/libs/installer/packagemanagercore.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/libs/installer/packagemanagercore.cpp')

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 0541cbeaa..b3c061bf7 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -433,6 +433,7 @@ void PackageManagerCore::writeMaintenanceTool()
                 dropAdminRights();
             d->m_needToWriteMaintenanceTool = false;
         } catch (const Error &error) {
+            qCritical() << "Error writing Maintenance Tool: " << error.message();
             MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
                 QLatin1String("WriteError"), tr("Error writing Maintenance Tool"), error.message(),
                 QMessageBox::Ok, QMessageBox::Ok);
@@ -867,14 +868,9 @@ PackageManagerCore::PackageManagerCore(qint64 magicmaker, const QList<OperationB
     if (!packagesWithoutOperation.isEmpty() || !orphanedOperations.isEmpty())  {
         qCritical() << "Operations missing for installed packages" << packagesWithoutOperation.toList();
         qCritical() << "Orphaned operations" << orphanedOperations.toList();
-        MessageBoxHandler::critical(
-                    MessageBoxHandler::currentBestSuitParent(),
-                    QLatin1String("Corrupt_Installation_Error"),
-                    QCoreApplication::translate("QInstaller", "Corrupt installation"),
-                    QCoreApplication::translate("QInstaller",
-                                                "Your installation seems to be corrupted. "
-                                                "Please consider re-installing from scratch."
-                                                ));
+        qCritical() << "Your installation seems to be corrupted. Please consider re-installing from scratch, "
+                       "remove the packages from components.xml which operations are missing, "
+                       "or reinstall the packages.";
     } else {
         qDebug() << "Operations sanity check succeeded.";
     }
-- 
cgit v1.2.3