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

[pkgselectprocess] Ensure apt-cdrom command outputs have their own prefix.

Browse Source
This commit is contained in:
Simon Quigley 2025-04-15 22:22:47 -05:00
parent 3282b74627
commit c93e956a5e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,8 @@ Calamares::JobResult PackageSelectProcess::runAptCommand(const QString& command,
commandHRPrefix = tr("Upgrading installed system: "); commandHRPrefix = tr("Upgrading installed system: ");
} else if (command.contains("remove")) { } else if (command.contains("remove")) {
commandHRPrefix = tr("Cleaning up packages: "); commandHRPrefix = tr("Cleaning up packages: ");
} else if (command.contains("cdrom")) {
commandHRPrefix = tr("cdrom: ");
} }
QRegularExpression getRegex(R"(Get:\d+\s+[^ ]+\s+[^ ]+\s+(.+?)\s+\S+\s+(\S+)\s+\[(.*?)\])"); QRegularExpression getRegex(R"(Get:\d+\s+[^ ]+\s+[^ ]+\s+(.+?)\s+\S+\s+(\S+)\s+\[(.*?)\])");

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ calamares-settings-ubuntu (1:25.04.26) UNRELEASED; urgency=medium
cycle, ideally being worked directly into a dedicated C++ module instead cycle, ideally being worked directly into a dedicated C++ module instead
of several, miscellaneous shell scripts wrapped in YAML. of several, miscellaneous shell scripts wrapped in YAML.
* [pkgselectprocess] Explicitly log all apt commands in the debug logs. * [pkgselectprocess] Explicitly log all apt commands in the debug logs.
* [pkgselectprocess] Ensure apt-cdrom command outputs have their own prefix.
-- 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