Merge remote-tracking branch 'origin/1.3'

Change-Id: Ifb2048c4e820735ae8df05e2603b50fbeaf604d2

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index e400ac197..064e74cb5 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -591,6 +591,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;