From f1b4b60f3a4a89ece8e5b292077cdcfd09cc2f50 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Wed, 13 May 2020 10:15:33 +0300 Subject: Fix interrupt() call from script Installer can be interrupted with interrupt() call from script. The interrupt was not correctly handled causing the installer to continue install successfully. Change-Id: I6c211ef985cc1a06445249bde27cdff5678a8ed0 Reviewed-by: Iikka Eklund --- src/libs/installer/packagemanagercore.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libs/installer/packagemanagercore.cpp') diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index bb754f568..6dbfd811b 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1451,7 +1451,9 @@ bool PackageManagerCore::fetchPackagesTree(const PackagesList &packages, const L bool success = false; if (!isUpdater()) { success = fetchAllPackages(packages, installedPackages); - if (success && !d->statusCanceledOrFailed() && isPackageManager()) { + if (d->statusCanceledOrFailed()) + return false; + if (success && isPackageManager()) { foreach (Package *const update, packages) { if (update->data(scEssential, scFalse).toString().toLower() == scTrue) { const QString name = update->data(scName).toString(); -- cgit v1.2.3