diff options
author | kh1 <qt-info@nokia.com> | 2011-03-22 10:01:33 +0100 |
---|---|---|
committer | kh1 <qt-info@nokia.com> | 2011-03-24 12:01:36 +0100 |
commit | 6c855d40802e815db057c008d38ff6fc5d1f0c17 (patch) | |
tree | d51a4b3656355cfbb31439ed648c25c613a233c9 /installerbuilder | |
parent | ab5654dda83027d4138d196221b2272fd58e6c70 (diff) |
Small cleanup.
Diffstat (limited to 'installerbuilder')
-rw-r--r-- | installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp | 7 | ||||
-rw-r--r-- | installerbuilder/libinstaller/getrepositoriesmetainfojob.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp b/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp index 6c8b2f545..5e53f3fb4 100644 --- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp +++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp @@ -119,6 +119,7 @@ void GetRepositoriesMetaInfoJob::fetchNextRepo() emitFinished(); return; } + if (m_repositories.isEmpty()) { if (m_haveIgnoredError) emitFinishedWithError(UserIgnoreError, m_errorString); @@ -126,11 +127,10 @@ void GetRepositoriesMetaInfoJob::fetchNextRepo() emitFinished(); return; } - const Repository r = m_repositories.back(); - m_repositories.pop_back(); + m_job = new GetRepositoryMetaInfoJob(m_publicKey, m_packageManager, this); - m_job->setRepository(r); m_job->setSilentRetries(silentRetries()); + m_job->setRepository(m_repositories.takeLast()); connect(m_job, SIGNAL(finished(KDJob*)), this, SLOT(jobFinished(KDJob*))); m_job->start(); } @@ -144,6 +144,7 @@ void GetRepositoriesMetaInfoJob::jobFinished(KDJob* j) { const GetRepositoryMetaInfoJob* const job = qobject_cast<const GetRepositoryMetaInfoJob*>(j); assert(job); + if(job->error() != KDJob::NoError && !job->temporaryDirectory().isEmpty()) { try { removeDirectory(job->temporaryDirectory()); diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h index 4391dc151..c8ccd194a 100644 --- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h +++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h @@ -52,14 +52,14 @@ class INSTALLER_EXPORT GetRepositoriesMetaInfoJob : public KDJob public: enum Error { - UserIgnoreError=KDJob::UserDefinedError + 1 + UserIgnoreError = KDJob::UserDefinedError + 1 }; explicit GetRepositoriesMetaInfoJob(const QByteArray &publicKey, bool packageManager = false, QObject *parent = 0); - QList< Repository > repositories() const; - void setRepositories(const QList<Repository> &repos); + QList<Repository> repositories() const; + void setRepositories(const QList<Repository> &repositories); QStringList temporaryDirectories() const; QStringList releaseTemporaryDirectories() const; |