summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-02-28 16:11:44 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2012-03-01 11:57:48 +0100
commit4e5d95928551d8a8a9f80964ea2077a31dd4b00b (patch)
treeeaff391d6880341da7c102425c260431b077cd89 /installerbuilder/libinstaller/getrepositorymetainfojob.cpp
parentb66e9cf4e51c784b6ef36fb3e51257ec25b3fed3 (diff)
Get rid of signing. We can put it back once we need it.
Change-Id: I1d8bc5655b25dafd30edfe24e7ef8f7fb6b1b9b6 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller/getrepositorymetainfojob.cpp')
-rw-r--r--installerbuilder/libinstaller/getrepositorymetainfojob.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
index 60ccc7b1f..8b95e8260 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
@@ -34,7 +34,6 @@
#include "constants.h"
#include "common/errors.h"
-#include "cryptosignatureverifier.h"
#include "lib7z_facade.h"
#include "messageboxhandler.h"
#include "packagemanagercore_p.h"
@@ -118,7 +117,6 @@ GetRepositoryMetaInfoJob::GetRepositoryMetaInfoJob(PackageManagerCorePrivate *co
m_canceled(false),
m_silentRetries(3),
m_retriesLeft(m_silentRetries),
- m_publicKey(corePrivate->m_settings.publicKey()),
m_downloader(0),
m_waitForDone(false),
m_corePrivate(corePrivate)
@@ -204,7 +202,7 @@ void GetRepositoryMetaInfoJob::startUpdatesXmlDownload()
return;
}
- m_downloader = FileDownloaderFactory::instance().create(url.scheme(), 0, QUrl(), this);
+ m_downloader = FileDownloaderFactory::instance().create(url.scheme(), this);
if (!m_downloader) {
finished(QInstaller::InvalidUrl, tr("URL scheme not supported: %1 (%2).").arg(url.scheme(),
url.toString()));
@@ -415,14 +413,7 @@ void GetRepositoryMetaInfoJob::fetchNextMetaInfo()
const QString repoUrl = m_repository.url().toString();
const QUrl url = QString::fromLatin1("%1/%2/%3meta.7z").arg(repoUrl, next,
online ? nextVersion : QString());
-
- if (!m_publicKey.isEmpty()) {
- const CryptoSignatureVerifier verifier(m_publicKey);
- const QUrl sigUrl = QString::fromLatin1("%1/%2/meta.7z.sig").arg(repoUrl, next);
- m_downloader = FileDownloaderFactory::instance().create(url.scheme(), &verifier, sigUrl, this);
- } else {
m_downloader = FileDownloaderFactory::instance().create(url.scheme(), this);
- }
if (!m_downloader) {
m_currentPackageName.clear();