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

[pkgselectprocess] Add a more robust check for apt packages when installing them (LP: #2089494).

Browse Source
This commit is contained in:
Simon Quigley 2024-11-24 20:50:58 -06:00
parent 9284c1f21b
commit e24341cb0e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,7 +361,14 @@ Calamares::JobResult PackageSelectProcess::exec()
if (!debPackages.isEmpty()) { if (!debPackages.isEmpty()) {
const QString packageList = debPackages.join(" "); const QString packageList = debPackages.join(" ");
const QString installCommand = QString( const QString installCommand = QString(
"DEBIAN_FRONTEND=noninteractive apt-get -y install $(for pkg in %1; do dpkg -s \"$pkg\" &>/dev/null || echo -n \"$pkg \"; done)" "packages_to_install=$(for pkg in %1; do "
"if ! dpkg -s \"$pkg\" &>/dev/null && apt-cache show \"$pkg\" &>/dev/null; then "
"printf \"%s \" \"$pkg\"; "
"fi; "
"done); "
"if [ -n \"$packages_to_install\" ]; then "
"DEBIAN_FRONTEND=noninteractive apt-get -y install $packages_to_install; "
"fi"
).arg(packageList); ).arg(packageList);
Calamares::JobResult installResult = runAptCommand(installCommand, Calamares::JobResult installResult = runAptCommand(installCommand,

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ calamares-settings-ubuntu (1:25.04.10) UNRELEASED; urgency=medium
* [pkgselectprocess] Add dpkg diversions for dracut, update-initramfs, and * [pkgselectprocess] Add dpkg diversions for dracut, update-initramfs, and
locale-gen. These will be called later in the process. locale-gen. These will be called later in the process.
* [pkgselectprocess] Add a more robust check for apt packages when
installing them (LP: #2089494).
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 24 Nov 2024 20:22:55 -0600 -- Simon Quigley <tsimonq2@ubuntu.com> Sun, 24 Nov 2024 20:22:55 -0600