folkslinux
/
dnf5
mirror of https://github.com/rpm-software-management/dnf5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dnf5: Handle script_output callback for transaction

This commit is contained in:
Marek Blaha 2024-08-21 15:04:54 +02:00
parent 0d6e2cff4d
commit eaf5dd982b
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dnf5/context.cpp
View File

@ -843,6 +843,27 @@ void RpmTransCB::cpio_error(const libdnf5::rpm::TransactionItem & item) {
multi_progress_bar.print();
}
void RpmTransCB::script_output(
[[maybe_unused]] const libdnf5::rpm::TransactionItem * item,
[[maybe_unused]] libdnf5::rpm::Nevra nevra,
[[maybe_unused]] libdnf5::rpm::TransactionCallbacks::ScriptType type,
uint64_t return_code,
const std::string output) {
if (!output.empty() && return_code != RPMRC_OK) {
libdnf5::cli::progressbar::MessageType msg_type;
if (return_code == RPMRC_NOTFOUND) {
msg_type = libdnf5::cli::progressbar::MessageType::WARNING;
} else {
msg_type = libdnf5::cli::progressbar::MessageType::ERROR;
}
active_progress_bar->add_message(msg_type, "Scriptlet output:");
for (auto & line : libdnf5::utils::string::split(output, "\n")) {
active_progress_bar->add_message(msg_type, line);
}
multi_progress_bar.print();
}
}
void RpmTransCB::script_error(
[[maybe_unused]] const libdnf5::rpm::TransactionItem * item,
libdnf5::rpm::Nevra nevra,
@ -883,7 +904,10 @@ void RpmTransCB::script_stop(
// Print the error message here.
active_progress_bar->add_message(
libdnf5::cli::progressbar::MessageType::WARNING,
fmt::format("Error in {} scriptlet: {}", script_type_to_string(type), to_full_nevra_string(nevra)));
fmt::format(
"Non-critical error in {} scriptlet: {}",
script_type_to_string(type),
to_full_nevra_string(nevra)));
[[fallthrough]];
default:
active_progress_bar->add_message(

7
dnf5/include/dnf5/context.hpp
View File

@ -224,6 +224,13 @@ public:
void cpio_error(const libdnf5::rpm::TransactionItem & item) override;
void script_output(
[[maybe_unused]] const libdnf5::rpm::TransactionItem * item,
libdnf5::rpm::Nevra nevra,
libdnf5::rpm::TransactionCallbacks::ScriptType type,
uint64_t return_code,
const std::string output) override;
void script_error(
[[maybe_unused]] const libdnf5::rpm::TransactionItem * item,
libdnf5::rpm::Nevra nevra,