From 125d443606b8d48308c5c034d50020829d921a7e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 24 Oct 2024 10:59:45 +0200 Subject: [PATCH] Android: Make installationRecipe return Error on at least one error Task-number: QTCREATORBUG-31812 Change-Id: I865e608e11b2d78cc4cad918fcbf6cd1353a9a2c Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidsdkmanager.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 9ddbaba5b10..1cba998f1aa 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -293,21 +293,23 @@ static GroupItem installationRecipe(const Storage &dialogStorage, }; return Group { + continueOnError, onGroupSetup(onSetup), For (uninstallIterator) >> Do { - finishAllAndSuccess, + continueOnError, ProcessTask(onUninstallSetup, onDone) }, For (installIterator) >> Do { - finishAllAndSuccess, + continueOnError, ProcessTask(onInstallSetup, onDone) - } + }, + onGroupDone([dialogStorage] { dialogStorage->m_dialog->setProgress(100); }) }; } static GroupItem updateRecipe(const Storage &dialogStorage) { - const auto onUpdateSetup = [dialogStorage](Process &process) { + const auto onSetup = [dialogStorage](Process &process) { const QStringList args = {"--update", sdkRootArg()}; QuestionProgressDialog *dialog = dialogStorage->m_dialog.get(); setupSdkProcess(args, &process, dialog, 0, 1); @@ -318,7 +320,7 @@ static GroupItem updateRecipe(const Storage &dialogStorage) handleSdkProcess(dialogStorage->m_dialog.get(), result); }; - return ProcessTask(onUpdateSetup, onDone); + return ProcessTask(onSetup, onDone); } class AndroidSdkManagerPrivate