diff options
author | kh1 <karsten.heimrich@digia.com> | 2014-10-29 17:29:40 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-10-30 13:40:57 +0100 |
commit | 624adb3699af26b1bd371cccced8fcc80a9450fb (patch) | |
tree | 7ada8e97a0ef2aacf49f2878115be4d399ce0065 /src/libs/installer/packagemanagercore.cpp | |
parent | d7e202fbd6c3fca115f62c09768ea732d6de4e13 (diff) |
Implement package filtering for online and offline installer.
Change-Id: If17725c0d97111aff67bcc0bc060fb74bb1109cd
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 686917623..792323086 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -2151,6 +2151,9 @@ bool PackageManagerCore::fetchAllPackages(const PackagesList &remotes, const Loc if (d->statusCanceledOrFailed()) return false; + if (!ProductKeyCheck::instance()->isValidPackage(package->data(scName).toString())) + continue; + QScopedPointer<QInstaller::Component> component(new QInstaller::Component(this)); data.package = package; component->loadDataFromPackage(*package); @@ -2197,6 +2200,9 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const if (d->statusCanceledOrFailed()) return false; + if (!ProductKeyCheck::instance()->isValidPackage(update->data(scName).toString())) + continue; + QScopedPointer<QInstaller::Component> component(new QInstaller::Component(this)); data.package = update; component->loadDataFromPackage(*update); |