diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-11-21 13:11:39 +0100 |
|---|---|---|
| committer | Niels Weber <niels.weber@theqtcompany.com> | 2014-11-21 13:18:48 +0100 |
| commit | e5cda8db3cf533d3412bff7b22b25c616501f679 (patch) | |
| tree | 07c0d1d933df0fd914404d03fccdb7c7403cc24c /src | |
| parent | b54bab7af0c1560f8504c30dfd4e3b16c2c5ff32 (diff) | |
Delete components.xml on cancelling installation
If in installer case in rollBackInstallation and all
packages removed, the components.xml needs to be
deleted.
Also this updating of the components.xml needs to happen
earlier so that we actually try to delete the directory
only afterwards.
Task-number: QTIFW-578
Change-Id: I64b450ad0fccbc1b1408ad1410c519511556a8ec
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 2303b2032..9d2be0278 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -628,6 +628,14 @@ void PackageManagerCore::rollBackInstallation() } } + packages.writeToDisk(); + if (isInstaller()) { + if (packages.packageInfoCount() == 0) { + QFile file(packages.fileName()); + file.remove(); + } + } + if (becameAdmin) dropAdminRights(); } catch (const Error &e) { @@ -641,7 +649,6 @@ void PackageManagerCore::rollBackInstallation() "error happened.")); } } - packages.writeToDisk(); } /*! |