summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-02-24 15:23:57 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2012-02-27 12:57:53 +0100
commit426e1cadfef98338e1cd059580463de2cc9379be (patch)
tree56c5b5383fda2eb4717e72b474c0066fdf51af7a /installerbuilder
parentab7fca0cfa59883b20e6b2d1e0b772b03106b216 (diff)
Add missing braces. Fix broken meta download finished.
In case the meta data download finished, but there was no hash given, the current package name wasn't reset so on the next run we would try to download the same file again and ended up in an endless loop. Reset the current name also in case there's no has to fix this loop. Change-Id: I1cdaa6e1fbbf13e3bb1852dc3d3fd8fffa28ee63 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/getrepositorymetainfojob.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
index 0b95f2db0..60ccc7b1f 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
@@ -340,13 +340,14 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
continue;
if (el.tagName() == QLatin1String("PackageUpdate")) {
const QDomNodeList c2 = el.childNodes();
- for (int j = 0; j < c2.count(); ++j)
+ for (int j = 0; j < c2.count(); ++j) {
if (c2.at(j).toElement().tagName() == scName)
m_packageNames << c2.at(j).toElement().text();
else if (c2.at(j).toElement().tagName() == scRemoteVersion)
m_packageVersions << c2.at(j).toElement().text();
else if (c2.at(j).toElement().tagName() == QLatin1String("SHA1"))
m_packageHash << c2.at(j).toElement().text();
+ }
}
}
@@ -478,9 +479,9 @@ void GetRepositoryMetaInfoJob::metaDownloadFinished()
return;
}
m_packageHash.removeLast();
- m_currentPackageName.clear();
}
arch.close();
+ m_currentPackageName.clear();
ZipRunnable *runnable = new ZipRunnable(fn, m_temporaryDirectory, m_downloader);
connect(runnable, SIGNAL(finished(bool,QString)), this, SLOT(unzipFinished(bool,QString)));