diff options
author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-03-30 13:44:01 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-03-30 14:40:05 +0200 |
commit | 66db6e0a4dba5614572f02e3a9b6913d2487ca8b (patch) | |
tree | aaeaa7b25a354ecfb6774a0ff27db36a0fd16c65 /src/libs/installer/fileutils.cpp | |
parent | c4b346aeb298b7dbd74e575843328b78fd00996c (diff) |
binarycreator shouldn't exit with error code if it can't clean up correctly
- in case there is something but ignoreErrors==true it is showing a warning message
Change-Id: I9c09a310960a56432975757496984bbe36fe5028
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Diffstat (limited to 'src/libs/installer/fileutils.cpp')
-rw-r--r-- | src/libs/installer/fileutils.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index ece86aa5d..29baf4765 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -234,8 +234,13 @@ void QInstaller::removeFiles(const QString &path, bool ignoreErrors) foreach (const QFileInfo &fi, entries) { if (fi.isSymLink() || fi.isFile()) { QFile f(fi.filePath()); - if (!f.remove() && !ignoreErrors) - throw Error(QObject::tr("Could not remove file %1: %2").arg(f.fileName(), f.errorString())); + if (!f.remove()) { + QString errorMessage = QObject::tr("Could not remove file %1: %2").arg(f.fileName(), f.errorString()); + if (ignoreErrors) + qWarning() << errorMessage; + else + throw Error(errorMessage); + } } } } @@ -259,8 +264,14 @@ void QInstaller::removeDirectory(const QString &path, bool ignoreErrors) removeFiles(path, ignoreErrors); foreach (const QString &dir, dirs) { errno = 0; - if (d.exists(path) && !d.rmdir(dir) && !ignoreErrors) - throw Error(QObject::tr("Could not remove folder %1: %2").arg(dir, QLatin1String(strerror(errno)))); + if (d.exists(path) && !d.rmdir(dir)) { + QString errorMessage = QObject::tr("Could not remove folder %1: %2").arg(dir, + QLatin1String(strerror(errno))); + if (ignoreErrors) + qWarning() << errorMessage; + else + throw Error(errorMessage); + } } } |