Merge remote-tracking branch 'origin/4.1'

Change-Id: I8adecc4573134d2b33f2b98fba9372320b2f8737

3 files changed, 20 insertions, 4 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index a8405a0e8..2a9cb5ae7 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -654,8 +654,11 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                     metaFound = parsePackageUpdate(c2, packageName, packageVersion, packageHash,
                                                    online, testCheckSum);
 
-                    //If meta element (script, licenses, etc.) is not found, no need to fetch metadata
-                    if (metaFound) {
+                    // If meta element (script, licenses, etc.) is not found, no need to fetch metadata.
+                    // The offline-generator instance is an exception to this - if the Updates.xml contains
+                    // checksum element for the meta-archive, we will fetch it, so that the temporary
+                    // location contents match the remote repository.
+                    if (metaFound || (m_core->isOfflineGenerator() && !packageHash.isEmpty())) {
                         const QString repoUrl = metadata.repository.url().toString();
                         addFileTaskItem(QString::fromLatin1("%1/%2/%3meta.7z").arg(repoUrl, packageName, packageVersion),
                             metadata.directory + QString::fromLatin1("/%1-%2-meta.7z").arg(packageName, packageVersion),
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 26df043a0..375cb6018 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -733,7 +733,7 @@ quint64 PackageManagerCore::requiredDiskSpace() const
     quint64 result = 0;
 
     foreach (QInstaller::Component *component, orderedComponentsToInstall())
-        result += size(component, scUncompressedSize);
+        result += size(component, isOfflineGenerator() ? scCompressedSize : scUncompressedSize);
 
     return result;
 }
@@ -2694,6 +2694,9 @@ bool PackageManagerCore::checkAvailableSpace(QString &message) const
         // if we create a local repository, take that space into account as well
         required += repositorySize;
     }
+    // if we create offline installer, take current executable size into account
+    if (isOfflineGenerator())
+        required += QFile(QCoreApplication::applicationFilePath()).size();
 
     qDebug() << "Installation space required:" << humanReadableSize(required) << "Temporary space "
         "required:" << humanReadableSize(tempRequired) << "Local repository size:"
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 1b14c306b..f5d3d3508 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -2285,6 +2285,11 @@ void PackageManagerCorePrivate::setComponentSelection(const QString &id, Qt::Che
 {
     ComponentModel *model = m_core->isUpdater() ? m_core->updaterComponentModel() : m_core->defaultComponentModel();
     Component *component = m_core->componentByName(id);
+    if (!component) {
+        qCWarning(QInstaller::lcInstallerInstallLog).nospace()
+            << "Unable to set selection for: " << id << ". Component not found.";
+        return;
+    }
     const QModelIndex &idx = model->indexFromComponentName(component->treeName());
     if (idx.isValid())
         model->setData(idx, state, Qt::CheckStateRole);
@@ -2812,7 +2817,12 @@ bool PackageManagerCorePrivate::calculateComponentsAndRun()
         qCDebug(QInstaller::lcInstallerInstallLog) << "Installation canceled.";
     } else if (componentsOk && acceptLicenseAgreements()) {
         qCDebug(QInstaller::lcInstallerInstallLog).noquote() << htmlToString(htmlOutput);
-        if (!(m_autoConfirmCommand || askUserConfirmCommand())) {
+
+        QString spaceInfo;
+        const bool spaceOk = m_core->checkAvailableSpace(spaceInfo);
+        qCDebug(QInstaller::lcInstallerInstallLog) << spaceInfo;
+
+        if (!spaceOk || !(m_autoConfirmCommand || askUserConfirmCommand())) {
             qCDebug(QInstaller::lcInstallerInstallLog) << "Installation aborted.";
         } else if (m_core->run()) {
             // Write maintenance tool if required