Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-06-07 07:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[pkgselectprocess] Ensure hasInternet is available as a local variable, so we can use it.

Browse Source
This commit is contained in:
Simon Quigley 2025-04-15 22:27:26 -05:00
parent f26f191a17
commit 6cb7d4dc52
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/modules/pkgselectprocess/PackageSelectProcess.cpp
View File

@ -281,7 +281,8 @@ Calamares::JobResult PackageSelectProcess::exec()
const QVariantMap installationData = gs->value("installation_data").toMap(); const QVariantMap installationData = gs->value("installation_data").toMap();
const QString installationMode = installationData.value("installation_mode").toString(); 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 packagesToInstall = installationData.value("packages_to_install").toList();
const QVariantList packagesToRemove = installationData.value("packages_to_remove").toList(); const QVariantList packagesToRemove = installationData.value("packages_to_remove").toList();
const QVariantList presentSnaps = installationData.value("present_snaps").toList(); const QVariantList presentSnaps = installationData.value("present_snaps").toList();

2
debian/changelog vendored
View File

@ -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 containing "*". For this cycle we can trust our distributors won't do
anything unusual, but next cycle, we need to perform explicit validation anything unusual, but next cycle, we need to perform explicit validation
on these items. If you are a downstream, please be careful. 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 <tsimonq2@ubuntu.com> Tue, 15 Apr 2025 22:15:17 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Tue, 15 Apr 2025 22:15:17 -0500