From 6cb7d4dc5289ab9dd2e8ead88f640fbbaa0f8cae Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 15 Apr 2025 22:27:26 -0500 Subject: [PATCH] [pkgselectprocess] Ensure hasInternet is available as a local variable, so we can use it. --- common/modules/pkgselectprocess/PackageSelectProcess.cpp | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/modules/pkgselectprocess/PackageSelectProcess.cpp b/common/modules/pkgselectprocess/PackageSelectProcess.cpp index cf39bf3..df7d25f 100644 --- a/common/modules/pkgselectprocess/PackageSelectProcess.cpp +++ b/common/modules/pkgselectprocess/PackageSelectProcess.cpp @@ -281,7 +281,8 @@ Calamares::JobResult PackageSelectProcess::exec() const QVariantMap installationData = gs->value("installation_data").toMap(); const QString installationMode = installationData.value("installation_mode").toString(); - const bool downloadUpdates = installationData.value("download_updates").toBool(); + const bool hasInternet = installationData.value("hasInternet").toBool(); + const bool downloadUpdates = (installationData.value("download_updates").toBool() && hasInternet); const QVariantList packagesToInstall = installationData.value("packages_to_install").toList(); const QVariantList packagesToRemove = installationData.value("packages_to_remove").toList(); const QVariantList presentSnaps = installationData.value("present_snaps").toList(); diff --git a/debian/changelog b/debian/changelog index 2e9f62c..be14676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ calamares-settings-ubuntu (1:25.04.26) UNRELEASED; urgency=medium containing "*". For this cycle we can trust our distributors won't do anything unusual, but next cycle, we need to perform explicit validation on these items. If you are a downstream, please be careful. + * [pkgselectprocess] Ensure hasInternet is available as a local variable, so + we can use it. -- Simon Quigley Tue, 15 Apr 2025 22:15:17 -0500