diff options
author | kh1 <qt-info@nokia.com> | 2011-03-24 12:00:36 +0100 |
---|---|---|
committer | kh1 <qt-info@nokia.com> | 2011-03-24 12:01:37 +0100 |
commit | a5507f265067a1268b29a204bf356d1951dc3be6 (patch) | |
tree | 4624925e8c278cd0048046935a7f69e8737cadf4 | |
parent | 2a5e32c6e323962ad3acd0c1e30a373bac8386bb (diff) |
Evaluate the installed packages as early as possible.
-rw-r--r-- | installerbuilder/libinstaller/qinstaller.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/installerbuilder/libinstaller/qinstaller.cpp b/installerbuilder/libinstaller/qinstaller.cpp index ee0673ea7..9259ad150 100644 --- a/installerbuilder/libinstaller/qinstaller.cpp +++ b/installerbuilder/libinstaller/qinstaller.cpp @@ -744,6 +744,8 @@ bool Installer::fetchAllPackages() if (isUninstaller() || isUpdater()) return false; + QHash<QString, KDUpdater::PackageInfo> installedPackages = localInstalledPackages(); + QScopedPointer <GetRepositoriesMetaInfoJob> metaInfoJob(fetchMetaInformation(*d->m_installerSettings)); if (metaInfoJob->isCanceled() || metaInfoJob->error() != KDJob::NoError) { verbose() << tr("Could not retrieve components: %1").arg(metaInfoJob->errorString()) << std::endl; @@ -773,8 +775,6 @@ bool Installer::fetchAllPackages() return false; } - QHash<QString, KDUpdater::PackageInfo> installedPackages = localInstalledPackages(); - emit startAllComponentsReset(); qDeleteAll(d->m_rootComponents); @@ -845,6 +845,8 @@ bool Installer::fetchUpdaterPackages() if (!isUpdater()) return false; + QHash<QString, KDUpdater::PackageInfo> installedPackages = localInstalledPackages(); + QScopedPointer <GetRepositoriesMetaInfoJob> metaInfoJob(fetchMetaInformation(*d->m_installerSettings)); if (metaInfoJob->isCanceled() || metaInfoJob->error() != KDJob::NoError) { verbose() << tr("Could not retrieve updates: %1").arg(metaInfoJob->errorString()) << std::endl; @@ -873,8 +875,6 @@ bool Installer::fetchUpdaterPackages() return false; } - QHash<QString, KDUpdater::PackageInfo> installedPackages = localInstalledPackages(); - emit startUpdaterComponentsReset(); qDeleteAll(d->m_updaterComponents); |