diff --git a/common/modules/pkgselectprocess/PackageSelectProcess.cpp b/common/modules/pkgselectprocess/PackageSelectProcess.cpp index f163106..cf39bf3 100644 --- a/common/modules/pkgselectprocess/PackageSelectProcess.cpp +++ b/common/modules/pkgselectprocess/PackageSelectProcess.cpp @@ -55,6 +55,8 @@ Calamares::JobResult PackageSelectProcess::runAptCommand(const QString& command, commandHRPrefix = tr("Upgrading installed system: "); } else if (command.contains("remove")) { 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+\[(.*?)\])"); diff --git a/debian/changelog b/debian/changelog index ed31534..b460ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 of several, miscellaneous shell scripts wrapped in YAML. * [pkgselectprocess] Explicitly log all apt commands in the debug logs. + * [pkgselectprocess] Ensure apt-cdrom command outputs have their own prefix. -- Simon Quigley Tue, 15 Apr 2025 22:15:17 -0500