Fix annoying warning that the file can not be deleted.

Define the downloadable target inside the remote directory
it belongs to, avoids the unnecessary delete inside the task
destructor. The temporary dir deleter will take care of it.
Change-Id: I4858a71dc714a33f1afb00eb2b2a167294899461
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

2 files changed, 6 insertions, 11 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index e119db1c5..0f4c8b74b 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -286,13 +286,15 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                     if (c2.at(j).toElement().tagName() == scName)
                         packageName = c2.at(j).toElement().text();
                     else if (c2.at(j).toElement().tagName() == scRemoteVersion)
-                        packageVersion = c2.at(j).toElement().text();
+                        packageVersion = (online ? c2.at(j).toElement().text() : QString());
                     else if (c2.at(j).toElement().tagName() == QLatin1String("SHA1"))
                         packageHash = c2.at(j).toElement().text();
                 }
+
                 const QString repoUrl = metadata.repository.url().toString();
-                FileTaskItem item(QString::fromLatin1("%1/%2/%3meta.7z").arg(repoUrl,
-                    packageName, (online ? packageVersion : QString())));
+                FileTaskItem item(QString::fromLatin1("%1/%2/%3meta.7z").arg(repoUrl, packageName,
+                    packageVersion), metadata.directory + QString::fromLatin1("/%1.meta.7z")
+                    .arg(packageName));
 
                 QAuthenticator authenticator;
                 authenticator.setUser(metadata.repository.username());
diff --git a/src/libs/installer/metadatajob_p.h b/src/libs/installer/metadatajob_p.h
index 3b1835a3c..331d142e6 100644
--- a/src/libs/installer/metadatajob_p.h
+++ b/src/libs/installer/metadatajob_p.h
@@ -73,14 +73,7 @@ public:
     UnzipArchiveTask(const QString &arcive, const QString &target)
         : m_archive(arcive), m_targetDir(target)
     {}
-    ~UnzipArchiveTask()
-    {
-        QFile file(m_archive);
-        if (!file.remove()) {
-            qWarning("Could not delete file %s: %s", qPrintable(m_archive), qPrintable(file
-                .errorString()));
-        }
-    }
+
     void doTask(QFutureInterface<void> &fi)
     {
         fi.reportStarted();