summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2012-03-09 11:26:46 +0100
committerNiels Weber <niels.2.weber@nokia.com>2012-03-20 13:39:49 +0100
commit2666fd5808b0b2987868f2a8deaf057c0f0e6364 (patch)
tree6f6945dc557e4581ccc8ae8361dc1d62e08c5e7a
parent0b5ac191a4a27c42c2d6bc658b4efdca7ee32f1e (diff)
Download localised Updates.xml if available
Change-Id: Icc602bf3460aa07dfa3395e68a25162aaf441072 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
-rw-r--r--src/libs/installer/getrepositorymetainfojob.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index a72a861a0..e814be5d7 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -114,7 +114,7 @@ private:
GetRepositoryMetaInfoJob::GetRepositoryMetaInfoJob(PackageManagerCorePrivate *corePrivate, QObject *parent)
: KDJob(parent),
m_canceled(false),
- m_silentRetries(3),
+ m_silentRetries(4),
m_retriesLeft(m_silentRetries),
m_downloader(0),
m_waitForDone(false),
@@ -208,8 +208,15 @@ void GetRepositoryMetaInfoJob::startUpdatesXmlDownload()
return;
}
+ QString UpdatesFileName;
+
+ if (m_retriesLeft == m_silentRetries)
+ UpdatesFileName = QString::fromLatin1("Updates_%1.xml").arg(QLocale().name().toLower());
+ else
+ UpdatesFileName = QString::fromLatin1("Updates.xml");
+
// append a random string to avoid proxy caches
- m_downloader->setUrl(QUrl(url.toString() + QString::fromLatin1("/Updates.xml?")
+ m_downloader->setUrl(QUrl(url.toString() + QString::fromLatin1("/%1?").arg(UpdatesFileName)
.append(QString::number(qrand() * qrand()))));
QAuthenticator auth;