Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix sdbus::ObjectPath when checking signals object_path #1711

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Fix sdbus::ObjectPath when checking signals object_path #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c7697
Fix deserialization when checking signals `object_path`
kontura Sep 19, 2024
8a447f4
dnf5daemon-server: Run transaction test for offline transactions
kontura Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dnf5daemon-client/callbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace dnfdaemon::client {

bool DbusCallback::signature_valid(sdbus::Signal & signal) {
// check that signal is emitted by the correct session object
std::string object_path;
sdbus::ObjectPath object_path;
signal >> object_path;
return object_path == context.get_session_object_path();
}
Expand Down
36 changes: 15 additions & 21 deletions dnf5daemon-server/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,13 +308,28 @@ void Session::download_transaction_packages() {
}

void Session::store_transaction_offline() {
// Download transaction packages
const auto & installroot = base->get_config().get_installroot_option().get_value();
const auto & dest_dir = installroot / libdnf5::offline::DEFAULT_DATADIR.relative_path() / "packages";
std::filesystem::create_directories(dest_dir);
base->get_config().get_destdir_option().set(dest_dir);
download_transaction_packages();
set_cancel_download(Session::CancelDownload::NOT_ALLOWED);

// Test the transaction
// TODO(mblaha): store transaction test/run problems in the session and add an API
// to retrieve it
base->get_config().get_tsflags_option().set(libdnf5::Option::Priority::RUNTIME, "test");
auto result = transaction->run();
if (result != libdnf5::base::Transaction::TransactionRunResult::SUCCESS) {
throw sdbus::Error(
dnfdaemon::ERROR_TRANSACTION,
fmt::format(
"offline rpm transaction test failed with code {}.",
static_cast<std::underlying_type_t<libdnf5::base::Transaction::TransactionRunResult>>(result)));
}

// Serialize the transaction
const auto & offline_datadir = installroot / libdnf5::offline::DEFAULT_DATADIR.relative_path();
std::filesystem::create_directories(offline_datadir);

Expand All @@ -330,34 +345,13 @@ void Session::store_transaction_offline() {
state_data.set_status(libdnf5::offline::STATUS_DOWNLOAD_INCOMPLETE);
state.write();

// First, serialize the transaction
transaction->store_comps(comps_location);

const auto transaction_json_path = offline_datadir / "transaction.json";
libdnf5::utils::fs::File transaction_json_file{transaction_json_path, "w"};
transaction_json_file.write(transaction->serialize(packages_in_trans_dir, comps_in_trans_dir));
transaction_json_file.close();

// Then, test the serialized transaction
// TODO(mblaha): store transaction test/run problems in the session and add an API
// to retrieve it
const auto & test_goal = std::make_unique<libdnf5::Goal>(*base);
test_goal->add_serialized_transaction(transaction_json_path);
auto test_transaction = test_goal->resolve();
if (test_transaction.get_problems() != libdnf5::GoalProblem::NO_PROBLEM) {
throw sdbus::Error(dnfdaemon::ERROR_TRANSACTION, "failed to resolve serialized offline transaction.");
}
base->get_config().get_tsflags_option().set(libdnf5::Option::Priority::RUNTIME, "test");

auto result = test_transaction.run();
if (result != libdnf5::base::Transaction::TransactionRunResult::SUCCESS) {
throw sdbus::Error(
dnfdaemon::ERROR_TRANSACTION,
fmt::format(
"offline rpm transaction test failed with code {}.",
static_cast<std::underlying_type_t<libdnf5::base::Transaction::TransactionRunResult>>(result)));
}

// Download and transaction test complete. Fill out entries in offline
// transaction state file.
state_data.set_cachedir(base->get_config().get_cachedir_option().get_value());
Expand Down
Loading