From bbe015e732b7cc7bf41c60fd53eac7de687fc278 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 30 Jun 2024 18:05:54 +0200 Subject: [PATCH] [libcalamares] Command verbosity was lost during expansion --- src/libcalamares/utils/CommandList.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp index b976c7928..6e3434aa3 100644 --- a/src/libcalamares/utils/CommandList.cpp +++ b/src/libcalamares/utils/CommandList.cpp @@ -165,7 +165,12 @@ CommandLine::expand( KMacroExpanderBase& expander ) const QStringList e = m_environment; std::for_each( e.begin(), e.end(), [ &expander ]( QString& s ) { expander.expandMacrosShellQuote( s ); } ); - return { c, m_environment, m_timeout }; + CommandLine l { c, m_environment, m_timeout }; + if ( m_verbose.has_value() ) + { + l.updateVerbose( m_verbose.value() ); + } + return l; } Calamares::CommandLine