diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-06-03 14:46:44 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-06-10 06:31:19 +0000 |
| commit | 7eebeaa99645b3cb5a1e6307ba3594378ba4727f (patch) | |
| tree | 7cd24485a9652fa01b5faaf65ab1d62b4c8c12ef /src/sdk | |
| parent | ffccc5a021632ba6989575da46a74bde0269fd8d (diff) | |
Refactor maintenance tool writing conditions
This change fixes a bug caused by a blocking runInstaller() call
in PerformInstallationPage::entering() and also contains refactoring
to related parts of code.
Change-Id: Ic3309707c1f975a646937aa96fc407a3e5931359
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/sdk')
| -rw-r--r-- | src/sdk/commandlineinterface.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/sdk/commandlineinterface.cpp b/src/sdk/commandlineinterface.cpp index 0ddf973d2..75ab19cd5 100644 --- a/src/sdk/commandlineinterface.cpp +++ b/src/sdk/commandlineinterface.cpp @@ -151,9 +151,8 @@ int CommandLineInterface::updatePackages() if (!checkLicense()) return EXIT_FAILURE; try { - if (m_core->updateComponentsSilently(m_positionalArguments)) - m_core->writeMaintenanceTool(); - return EXIT_SUCCESS; + return m_core->updateComponentsSilently(m_positionalArguments) + ? EXIT_SUCCESS : EXIT_FAILURE; } catch (const QInstaller::Error &err) { qCCritical(QInstaller::lcInstallerInstallLog) << err.message(); return EXIT_FAILURE; @@ -172,12 +171,12 @@ int CommandLineInterface::installPackages() return EXIT_FAILURE; } // No packages provided, install default components - if (m_core->installDefaultComponentsSilently()) - m_core->writeMaintenanceTool(); - } else if (m_core->installSelectedComponentsSilently(m_positionalArguments)) { - m_core->writeMaintenanceTool(); + return m_core->installDefaultComponentsSilently() + ? EXIT_SUCCESS : EXIT_FAILURE; } - return EXIT_SUCCESS; + // Normal installation + return m_core->installSelectedComponentsSilently(m_positionalArguments) + ? EXIT_SUCCESS : EXIT_FAILURE; } catch (const QInstaller::Error &err) { qCCritical(QInstaller::lcInstallerInstallLog) << err.message(); return EXIT_FAILURE; @@ -194,9 +193,8 @@ int CommandLineInterface::uninstallPackages() } m_core->setPackageManager(); try { - if (m_core->uninstallComponentsSilently(m_positionalArguments)) - m_core->writeMaintenanceTool(); - return EXIT_SUCCESS; + return m_core->uninstallComponentsSilently(m_positionalArguments) + ? EXIT_SUCCESS : EXIT_FAILURE; } catch (const QInstaller::Error &err) { qCCritical(QInstaller::lcInstallerInstallLog) << err.message(); return EXIT_FAILURE; |