Skip to content

Commit

Permalink
transaction_sr: Remove excessive "." from exceptions
Browse files Browse the repository at this point in the history
The ending dot is added later when the string is formatted.
For example in `LogEvent::to_string()`.
  • Loading branch information
kontura committed Jul 2, 2024
1 parent a8e187b commit 82289e6
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions libdnf5/transaction/transaction_sr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ TransactionReplay parse_transaction_replay(const std::string & json_serialized_t
if (std::find_if(versions[1].begin(), versions[1].end(), [](unsigned char c) {
return std::isdigit(c) == 0;
}) != versions[1].end()) {
throw TransactionReplayError(M_("Invalid minor version: \"{}\", number expected."), versions[1]);
throw TransactionReplayError(M_("Invalid minor version: \"{}\", number expected"), versions[1]);
}
} else {
throw TransactionReplayError(M_("Missing key \"version\"."));
throw TransactionReplayError(M_("Missing key \"version\""));
}


Expand All @@ -94,20 +94,20 @@ TransactionReplay parse_transaction_replay(const std::string & json_serialized_t
std::string repo_id;

if (json_object_is_type(json_environments, json_type_array) == 0) {
throw TransactionReplayError(M_("Unexpected type of \"environments\", array expected."));
throw TransactionReplayError(M_("Unexpected type of \"environments\", array expected"));
}

for (std::size_t i = 0; i < json_object_array_length(json_environments); ++i) {
struct json_object * environment = json_object_array_get_idx(json_environments, i);
if (json_object_object_get_ex(environment, "id", &value) != 0) {
environment_id = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"id\" in an environment."));
throw TransactionReplayError(M_("Missing object key \"id\" in an environment"));
}
if (json_object_object_get_ex(environment, "action", &value) != 0) {
action = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"action\" in an environment."));
throw TransactionReplayError(M_("Missing object key \"action\" in an environment"));
}
if (json_object_object_get_ex(environment, "environment_path", &value) != 0) {
environment_path = json_object_get_string(value);
Expand All @@ -134,25 +134,25 @@ TransactionReplay parse_transaction_replay(const std::string & json_serialized_t
comps::PackageType package_types;

if (json_object_is_type(json_groups, json_type_array) == 0) {
throw TransactionReplayError(M_("Unexpected type of \"groups\", array expected."));
throw TransactionReplayError(M_("Unexpected type of \"groups\", array expected"));
}

for (std::size_t i = 0; i < json_object_array_length(json_groups); ++i) {
struct json_object * group = json_object_array_get_idx(json_groups, i);
if (json_object_object_get_ex(group, "id", &value) != 0) {
group_id = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"id\" in a group."));
throw TransactionReplayError(M_("Missing object key \"id\" in a group"));
}
if (json_object_object_get_ex(group, "action", &value) != 0) {
action = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"action\" in a group."));
throw TransactionReplayError(M_("Missing object key \"action\" in a group"));
}
if (json_object_object_get_ex(group, "reason", &value) != 0) {
reason = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"reason\" in a group."));
throw TransactionReplayError(M_("Missing object key \"reason\" in a group"));
}
if (json_object_object_get_ex(group, "group_path", &value) != 0) {
group_path = json_object_get_string(value);
Expand Down Expand Up @@ -188,7 +188,7 @@ TransactionReplay parse_transaction_replay(const std::string & json_serialized_t
std::string package_path;

if (json_object_is_type(json_packages, json_type_array) == 0) {
throw TransactionReplayError(M_("Unexpected type of \"rpms\", array expected."));
throw TransactionReplayError(M_("Unexpected type of \"rpms\", array expected"));
}

for (std::size_t i = 0; i < json_object_array_length(json_packages); ++i) {
Expand All @@ -197,33 +197,33 @@ TransactionReplay parse_transaction_replay(const std::string & json_serialized_t
nevra = json_object_get_string(value);
// Verify we have a full nevra
if (libdnf5::rpm::Nevra::parse(nevra, {libdnf5::rpm::Nevra::Form::NEVRA}).empty()) {
throw TransactionReplayError(M_("Cannot parse NEVRA for rpm \"{}\"."), nevra);
throw TransactionReplayError(M_("Cannot parse NEVRA for rpm \"{}\""), nevra);
}
}
if (json_object_object_get_ex(package, "package_path", &value) != 0) {
package_path = json_object_get_string(value);
}
if (nevra.empty() && package_path.empty()) {
throw TransactionReplayError(
M_("Either \"nevra\" or \"package_path\" object key is required in an rpm."));
M_("Either \"nevra\" or \"package_path\" object key is required in an rpm"));
}
if (json_object_object_get_ex(package, "action", &value) != 0) {
action = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"action\" in an rpm."));
throw TransactionReplayError(M_("Missing object key \"action\" in an rpm"));
}
if (json_object_object_get_ex(package, "reason", &value) != 0) {
reason = json_object_get_string(value);
} else {
throw TransactionReplayError(M_("Missing object key \"reason\" in an rpm."));
throw TransactionReplayError(M_("Missing object key \"reason\" in an rpm"));
}
if (json_object_object_get_ex(package, "group_id", &value) != 0) {
group_id = json_object_get_string(value);
} else {
if (reason == "Group" && action == "Reason Change") {
throw TransactionReplayError(
M_("Missing mandatory object key \"group_id\" in an rpm with reason \"Group\" and action "
"\"Reason Change\"."));
"\"Reason Change\""));
}
}
if (json_object_object_get_ex(package, "repo_id", &value) != 0) {
Expand Down

0 comments on commit 82289e6

Please sign in to comment.