From fcb1693e83e523bb2ea020eece4942976f5a8893 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 22 Feb 2013 13:57:00 +0100 Subject: SDKtool: Fix removal of toolchains Change-Id: If66745582adcae1dbdb101cecc426280c1be182f Reviewed-by: Rainer Keller Reviewed-by: Tobias Hunger --- src/tools/sdktool/addkeysoperation.cpp | 6 +++--- src/tools/sdktool/addkitoperation.cpp | 8 ++++---- src/tools/sdktool/addqtoperation.cpp | 6 +++--- src/tools/sdktool/addtoolchainoperation.cpp | 6 +++--- src/tools/sdktool/rmkeysoperation.cpp | 2 +- src/tools/sdktool/rmkitoperation.cpp | 6 +++--- src/tools/sdktool/rmtoolchainoperation.cpp | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/tools/sdktool/addkeysoperation.cpp b/src/tools/sdktool/addkeysoperation.cpp index 31559a082d..eea188db9a 100644 --- a/src/tools/sdktool/addkeysoperation.cpp +++ b/src/tools/sdktool/addkeysoperation.cpp @@ -81,12 +81,12 @@ int AddKeysOperation::execute() const QVariantMap map = load(m_file); - map = addKeys(map, m_data); - if (map.isEmpty()) + QVariantMap result = addKeys(map, m_data); + if (map.isEmpty() || map == result) return -4; // Write data again: - return save(map, m_file) ? 0 : -5; + return save(result, m_file) ? 0 : -5; } #ifdef WITH_TESTS diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 499f2280f5..03aed153d4 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -214,13 +214,13 @@ int AddKitOperation::execute() const if (map.isEmpty()) map = initializeKits(); - map = addKit(map, m_id, m_displayName, m_icon, m_debuggerEngine, m_debugger, - m_deviceType.toUtf8(), m_sysRoot, m_tc, m_qt, m_mkspec, m_extra); + QVariantMap result = addKit(map, m_id, m_displayName, m_icon, m_debuggerEngine, m_debugger, + m_deviceType.toUtf8(), m_sysRoot, m_tc, m_qt, m_mkspec, m_extra); - if (map.isEmpty()) + if (map.isEmpty() || map == result) return -2; - return save(map, QLatin1String("profiles")) ? 0 : -3; + return save(result, QLatin1String("profiles")) ? 0 : -3; } #ifdef WITH_TESTS diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index 1ab4b56c71..5fa0b47298 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -152,12 +152,12 @@ int AddQtOperation::execute() const if (map.isEmpty()) map = initializeQtVersions(); - map = addQt(map, m_id, m_displayName, m_type, m_qmake, m_extra); + QVariantMap result = addQt(map, m_id, m_displayName, m_type, m_qmake, m_extra); - if (map.isEmpty()) + if (map.isEmpty() || result == map) return -2; - return save(map, QLatin1String("qtversions")) ? 0 : -3; + return save(result, QLatin1String("qtversions")) ? 0 : -3; } #ifdef WITH_TESTS diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 45351ae392..0eeeb8dfde 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -149,11 +149,11 @@ int AddToolChainOperation::execute() const if (map.isEmpty()) map = initializeToolChains(); - map = addToolChain(map, m_id, m_displayName, m_path, m_targetAbi, m_supportedAbis, m_extra); - if (map.isEmpty()) + QVariantMap result = addToolChain(map, m_id, m_displayName, m_path, m_targetAbi, m_supportedAbis, m_extra); + if (map.isEmpty() || map == result) return -2; - return save(map, QLatin1String("toolchains")) ? 0 : -3; + return save(result, QLatin1String("toolchains")) ? 0 : -3; } #ifdef WITH_TESTS diff --git a/src/tools/sdktool/rmkeysoperation.cpp b/src/tools/sdktool/rmkeysoperation.cpp index 858e5a2f4e..bd49b4df5b 100644 --- a/src/tools/sdktool/rmkeysoperation.cpp +++ b/src/tools/sdktool/rmkeysoperation.cpp @@ -72,7 +72,7 @@ int RmKeysOperation::execute() const return 1; // Write data again: - return save(map, m_file) ? 0 : 2; + return save(result, m_file) ? 0 : 2; } #ifdef WITH_TESTS diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp index b2699c7989..31d9537332 100644 --- a/src/tools/sdktool/rmkitoperation.cpp +++ b/src/tools/sdktool/rmkitoperation.cpp @@ -87,12 +87,12 @@ int RmKitOperation::execute() const if (map.isEmpty()) map = AddKitOperation::initializeKits(); - map = rmKit(map, m_id); + QVariantMap result = rmKit(map, m_id); - if (map.isEmpty()) + if (result.isEmpty() || result == map) return -2; - return save(map, QLatin1String("profiles")) ? 0 : -3; + return save(result, QLatin1String("profiles")) ? 0 : -3; } #ifdef WITH_TESTS diff --git a/src/tools/sdktool/rmtoolchainoperation.cpp b/src/tools/sdktool/rmtoolchainoperation.cpp index 9d6a96b8ce..0224e94f55 100644 --- a/src/tools/sdktool/rmtoolchainoperation.cpp +++ b/src/tools/sdktool/rmtoolchainoperation.cpp @@ -93,7 +93,7 @@ int RmToolChainOperation::execute() const if (result == map) return -2; - return save(map, QLatin1String("toolchains")) ? 0 : -3; + return save(result, QLatin1String("toolchains")) ? 0 : -3; } #ifdef WITH_TESTS -- cgit v1.2.3