diff options
author | Katja Marttila <katja.marttila@qt.io> | 2021-01-22 14:50:16 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2021-02-05 09:07:04 +0200 |
commit | 5aee36b74eb1d7613ea0108971e8a22f8dca8101 (patch) | |
tree | 30842cc3b88483c18facd2510ed7c5e3d0a0f138 /src/libs/installer/packagemanagercore.cpp | |
parent | a7b0eead83379d9343429a37efa8e39f924e8525 (diff) |
Try rerunning execute operation
Execute operation can have hard coded paths to program which is
executed. In case the program is relocated, UNDO operation will fail as
it will not find the program. Implemented new XXXX_OLD value which can
be used for overwriting the hardcoded value. In case the program
execution fails, program is tried to launch again with the replaced
value.
Task-number: QTIFW-2125
Change-Id: I446a4c423e53cc4ffc6e5e25617d2400945ac3d9
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index ed513fb69..7eaae7b33 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -875,7 +875,7 @@ void PackageManagerCore::rollBackInstallation() operation->setValue(QLatin1String("forceremoval"), false); } - PackageManagerCorePrivate::performOperationThreaded(operation, PackageManagerCorePrivate::Undo); + PackageManagerCorePrivate::performOperationThreaded(operation, Operation::Undo); const QString componentName = operation->value(QLatin1String("component")).toString(); if (!componentName.isEmpty()) { @@ -2963,7 +2963,7 @@ bool PackageManagerCore::performOperation(const QString &name, const QStringList op->setArguments(replaceVariables(arguments)); op->backup(); if (!PackageManagerCorePrivate::performOperationThreaded(op.data())) { - PackageManagerCorePrivate::performOperationThreaded(op.data(), PackageManagerCorePrivate::Undo); + PackageManagerCorePrivate::performOperationThreaded(op.data(), Operation::Undo); return false; } return true; @@ -3121,6 +3121,17 @@ QStringList PackageManagerCore::values(const QString &key, const QStringList &de } /*! + Returns the installer key for \a value. If \a value is not known, empty string is + returned. + + \sa {installer::key}{installer.key} +*/ +QString PackageManagerCore::key(const QString &value) const +{ + return d->m_data.key(value); +} + +/*! Sets the installer value for \a key to \a value. \sa {installer::setValue}{installer.setValue} |