From 26bcc99834b64cbad14ba788f0ea36fd1a6a64de Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 5 Mar 2013 15:15:02 +0100 Subject: filter sha1 files in createArchive script call Change-Id: Ibc91cfae6d860d69b95f33a9fe12c0518e522792 Reviewed-by: Karsten Heimrich --- src/libs/installer/component.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 707381b39..0bdb36bff 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -593,6 +593,12 @@ void Component::createOperationsForPath(const QString &path) */ void Component::createOperationsForArchive(const QString &archive) { + const QFileInfo fi(archive); + + // don't do anything with sha1 files + if (fi.suffix() == QLatin1String("sha1") && QFileInfo(fi.dir(), fi.completeBaseName()).exists()) + return; + // the script can override this method if (callScriptMethod(QLatin1String("createOperationsForArchive"), QScriptValueList() << archive).isValid()) return; -- cgit v1.2.3