diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-12 15:10:15 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-12 15:10:15 +0100 |
commit | de8d24fa6ccca3b201a8468d90631af7124c9c3c (patch) | |
tree | a9d6928741a6725a0c858108943247d301db777a /src/libs/installer/packagemanagercore_p.cpp | |
parent | 887efb810f4773ed0b4cf8c8cc3e53ec846c8146 (diff) | |
parent | 9e4194a90026cfc9fce2d59256813193e54859d6 (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 5bcbb5418..35603eab3 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -60,7 +60,9 @@ #include "kdupdaterupdateoperationfactory.h" #include "kdupdaterupdatefinder.h" -#include <QtConcurrentRun> +#include <productkeycheck.h> + +#include <QtCore/QtConcurrentRun> #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDirIterator> @@ -555,6 +557,16 @@ QString PackageManagerCorePrivate::installReason(Component *component) void PackageManagerCorePrivate::initialize(const QHash<QString, QString> ¶ms) { + if (!ProductKeyCheck::instance()->hasValidKey()) { + if (m_core->isInstaller()) { + setStatus(PackageManagerCore::Failure, ProductKeyCheck::instance()->lastErrorString()); + } else { + MessageBoxHandler::warning(MessageBoxHandler::currentBestSuitParent(), + QLatin1String("ProductKeyCheckError"), ProductKeyCheck::instance()->lastErrorString(), + ProductKeyCheck::instance()->maintainanceToolDetailErrorNotice(), QMessageBox::Ok); + } + } + m_coreCheckedHash.clear(); m_data = PackageManagerCoreData(params); m_componentsToInstallCalculated = false; |