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.

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

Fix misspellings #1173

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
- modules: Simplify finding whether profile is default in module list
- modules: Fix `ModuleProfile::is_default` method
- modules: Store if profile is default in ModuleProfile object
- Generate docs for undocummented functions so they at least show up
- Generate docs for undocumented functions so they at least show up
- Add python advisory docs
- Add advisory python API tests
- Enable AdvisoryModule bindings
Expand Down Expand Up @@ -176,7 +176,7 @@
- Abort PGP checking immediately if any checks fail
- Display warning message when any PGP checks skipped
- Don't allow main gpgcheck=0 to override repo config
- gups and environments to `history info` ouput
- gups and environments to `history info` output
- Store missing id and repoid in db for groups/environments
- Fix out-of-bounds access in Goal::Impl::add_install_to_goal
- Fix repoquery `--list`
Expand Down
2 changes: 1 addition & 1 deletion bindings/perl5/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ elseif(PERL_INSTALLDIRS STREQUAL "vendor")
elseif(PERL_INSTALLDIRS STREQUAL "site")
set(PERL_INSTALL_PATH "${PERL_SITEARCH}")
else()
message(FATAL_ERROR "Uknown PERL_INSTALLDIRS value: ${PERL_INSTALLDIRS}")
message(FATAL_ERROR "Unknown PERL_INSTALLDIRS value: ${PERL_INSTALLDIRS}")
endif()
message(STATUS "Perl5 files will be installed to ${PERL_INSTALL_PATH}")

Expand Down
10 changes: 5 additions & 5 deletions bindings/python3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ function(add_python3_module LIBRARY_NAME MODULE_NAME)
set(SWIG_COMPILE_OPTIONS ${SWIG_COMPILE_OPTIONS}
-Wno-redundant-decls
)
# Currenly the SWIG_PYTHON_SILENT_MEMLEAK controls only whether message:
# Currently the SWIG_PYTHON_SILENT_MEMLEAK controls only whether message:
# "swig/python detected a memory leak of type '%s', no destructor found." is printed, used here:
# https://github.com/swig/swig/blob/33f6a2d0b2c3d90b928f56ddfa599afe87903f76/Lib/python/pyrun.swg#L776
# We want to supress this message due to a bug in Python part of swig.
# We want to suppress this message due to a bug in Python part of swig.
# The core of the issue is that Python Swig has a global list of types used in all swig modules. This is
# needed because the modules are interlinked eg. libdnf5::Base is used in all of them. During finalization
# of the Python runtime unused modules are cleaned up before garbage collector runs and cleans global objects.
# This can result in a situation where for example libdnf5.advisory module is destoyed, removing its types
# from the global swig types list includeing libdnf5.base.Base, and only after that a global libdnf5.base.Base
# is garbage collected which is now missing type information -> no destructor can be called -> swig want's to
# This can result in a situation where for example libdnf5.advisory module is destroyed, removing its types
# from the global swig types list including libdnf5.base.Base, and only after that a global libdnf5.base.Base
# is garbage collected which is now missing type information -> no destructor can be called -> swig wants to
# print the message
# There is an issue reported on SWIG with the same root cause: https://github.com/swig/swig/issues/2037 it
# also contains more details.
Expand Down
2 changes: 1 addition & 1 deletion common/utils/regex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ along with libdnf. If not, see <https://www.gnu.org/licenses/>.
#define LIBDNF5_UTILS_REGEX_HPP


// Limit the string legth, because GCC std::regex_match() exhausts a stack on very long strings.
// Limit the string length, because GCC std::regex_match() exhausts a stack on very long strings.
#define MAX_STRING_LENGTH_FOR_REGEX_MATCH 2 << 10


Expand Down
2 changes: 1 addition & 1 deletion dnf5-plugins/builddep_plugin/builddep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void BuildDepCommand::run() {
auto goal = get_context().get_goal();
goal->set_allow_erasing(allow_erasing->get_value());

// Search only for solution in provides and files. Use buildrequire with name search migh result in inconsistent
// Search only for solution in provides and files. Use buildrequire with name search might result in inconsistent
// behavior with installing dependencies of RPMs
libdnf5::GoalJobSettings settings;
settings.with_nevra = false;
Expand Down
2 changes: 1 addition & 1 deletion dnf5-plugins/config-manager_plugin/addrepo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ConfigManagerAddRepoCommand : public Command {

/// Tests if the repositories IDs in the vector do not already exist in the configuration.
/// @param repo_ids List of repositories IDs to check.
/// @param ignore_path The file in this path will be ignored/skiped.
/// @param ignore_path The file in this path will be ignored/skipped.
/// @throws ConfigManagerError Trown if an already existent repository ID was found.
void test_if_ids_not_already_exist(
const std::vector<std::string> & repo_ids, const std::filesystem::path & ignore_path) const;
Expand Down
2 changes: 1 addition & 1 deletion dnf5-plugins/config-manager_plugin/setopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void ConfigManagerSetOptCommand::set_argument_parser() {
std::string{value});
}

// Save the repository option for later processing (solving glob patter, writing to file).
// Save the repository option for later processing (solving glob pattern, writing to file).
auto repo_id = key.substr(0, dot_pos);
if (repo_id.empty()) {
throw cli::ArgumentParserError(
Expand Down
2 changes: 1 addition & 1 deletion dnf5-plugins/config-manager_plugin/unsetopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void ConfigManagerUnsetOptCommand::set_argument_parser() {
std::string{value});
}

// Save the repository option for later processing (solving glob patter, writing to file).
// Save the repository option for later processing (solving glob pattern, writing to file).
auto repo_id = key.substr(0, dot_pos);
if (repo_id.empty()) {
throw cli::ArgumentParserError(
Expand Down
2 changes: 1 addition & 1 deletion dnf5-plugins/copr_plugin/copr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void CoprCommand::register_subcommands() {


std::string CoprSubCommandWithID::get_project_spec() {
// The HUB specified in the COPR SPEC arguement has precedence
// The HUB specified in the COPR SPEC argument has precedence
// over the --hub argument.
std::string hubspec = opt_hub;
if (hubspec.empty())
Expand Down
2 changes: 1 addition & 1 deletion dnf5.spec
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ Requires: libdnf5-devel%{?_isa} = %{version}-%{release}
Requires: libdnf5-cli-devel%{?_isa} = %{version}-%{release}

%description -n dnf5-devel
Develpment files for dnf5.
Development files for dnf5.

%files -n dnf5-devel
%{_includedir}/dnf5/
Expand Down
14 changes: 7 additions & 7 deletions dnf5/cmdline_aliases.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ bool attach_named_args(
}
if (!attached_arg_id_path) {
auto msg = fmt::format(
"Mising attribute \"id_path\" for alias \"{}\" in file \"{}\"", alias_id_path, path.native());
"Missing attribute \"id_path\" for alias \"{}\" in file \"{}\"", alias_id_path, path.native());
logger.error("{}", msg);
std::cerr << msg << std::endl;
return false;
Expand Down Expand Up @@ -124,7 +124,7 @@ void load_aliases_from_toml_file(Context & context, const fs::path & config_file
std::cerr << msg << std::endl;
return;
} catch (const std::out_of_range & e) {
auto msg = fmt::format("Mising attribute \"version\" in file \"{}\"", config_file_path.native());
auto msg = fmt::format("Missing attribute \"version\" in file \"{}\"", config_file_path.native());
logger->error("{}", msg);
std::cerr << msg << std::endl;
return;
Expand Down Expand Up @@ -173,7 +173,7 @@ void load_aliases_from_toml_file(Context & context, const fs::path & config_file
} catch (const libdnf5::cli::ArgumentParserNotFoundError & e) {
auto location = element_options.location();
auto msg = fmt::format(
"Parent commant \"{}\" not found: {}: Requested in file \"{}\" on line {}: {}",
"Parent command \"{}\" not found: {}: Requested in file \"{}\" on line {}: {}",
element_parent_id_path,
e.what(),
config_file_path.native(),
Expand Down Expand Up @@ -211,7 +211,7 @@ void load_aliases_from_toml_file(Context & context, const fs::path & config_file
}
} catch (const std::out_of_range & e) {
auto msg = fmt::format(
"Mising attribute \"type\" for element \"{}\" in file \"{}\"",
"Missing attribute \"type\" for element \"{}\" in file \"{}\"",
element_id_path,
config_file_path.native());
logger->error("{}", msg);
Expand Down Expand Up @@ -288,7 +288,7 @@ void load_aliases_from_toml_file(Context & context, const fs::path & config_file

if (!header) {
auto msg = fmt::format(
"Mising attribute \"header\" for element \"{}\" in file \"{}\"",
"Missing attribute \"header\" for element \"{}\" in file \"{}\"",
element_id_path,
config_file_path.native());
logger->error("{}", msg);
Expand Down Expand Up @@ -391,7 +391,7 @@ void load_aliases_from_toml_file(Context & context, const fs::path & config_file

if (!source) {
auto msg = fmt::format(
"Mising attribute \"source\" for named argument \"{}\" in file \"{}\"",
"Missing attribute \"source\" for named argument \"{}\" in file \"{}\"",
element_id_path,
config_file_path.native());
logger->error("{}", msg);
Expand Down Expand Up @@ -604,7 +604,7 @@ void load_aliases_from_toml_file(Context & context, const fs::path & config_file

if (!attached_command) {
auto msg = fmt::format(
"Mising attribute \"attached_command\" for command \"{}\" in file \"{}\"",
"Missing attribute \"attached_command\" for command \"{}\" in file \"{}\"",
element_id_path,
config_file_path.native());
logger->error("{}", msg);
Expand Down
2 changes: 1 addition & 1 deletion dnf5/commands/history/history_store.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void HistoryStoreCommand::run() {
if (std::filesystem::exists(tmp_path)) {
std::cout << libdnf5::utils::sformat(
_("File \"{}\" already exists, it will be overwritten.\n"), tmp_path.string());
// ask user for the file overwride confirmation
// ask user for the file overwrite confirmation
if (!libdnf5::cli::utils::userconfirm::userconfirm(get_context().base.get_config())) {
throw libdnf5::cli::AbortedByUserError();
}
Expand Down
2 changes: 1 addition & 1 deletion dnf5/commands/list/list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void ListCommand::set_argument_parser() {
}

void ListCommand::configure() {
// TODO(mblaha): do not force expired metadata sync if not explicitely required
// TODO(mblaha): do not force expired metadata sync if not explicitly required
pkg_narrow = PkgNarrow::ALL;
Context::LoadAvailableRepos load_available = Context::LoadAvailableRepos::ENABLED;
bool load_system = true;
Expand Down
2 changes: 1 addition & 1 deletion dnf5/commands/repoquery/repoquery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ libdnf5::rpm::PackageQuery repeat_filter(
libdnf5::rpm::PackageQuery & candidates,
const std::vector<std::string> & arches) {
// Create source query of all considered packages.
// To match dnf4 take arch filter into acccount.
// To match dnf4 take arch filter into account.
// (filtering by repo and available/installed is done implicitly by loading only the required metadata)
libdnf5::rpm::PackageQuery all_considered(candidates.get_base());
if (!arches.empty()) {
Expand Down
4 changes: 2 additions & 2 deletions dnf5/library.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace dnf5::utils {
Library::Library(const std::string & path) : path(path) {
handle = dlopen(path.c_str(), RTLD_LAZY);
if (!handle) {
const char * err_msg = dlerror(); // returns localized mesage, problem with later translation
const char * err_msg = dlerror(); // returns localized message, problem with later translation
throw std::runtime_error(
libdnf5::utils::sformat(_("Cannot load shared library \"{}\": {}"), path, std::string(err_msg)));
}
Expand All @@ -42,7 +42,7 @@ void * Library::get_address(const char * symbol) const {
dlerror(); // Clear any existing error
void * address = dlsym(handle, symbol);
if (!address) {
const char * err_msg = dlerror(); // returns localized mesage, problem with later translation
const char * err_msg = dlerror(); // returns localized message, problem with later translation
if (err_msg) {
throw std::runtime_error(libdnf5::utils::sformat(
_("Cannot obtain address of symbol \"{}\": {}"), std::string(symbol), std::string(err_msg)));
Expand Down
2 changes: 1 addition & 1 deletion dnf5daemon-client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(GETTEXT_DOMAIN dnf5daemon-client)
add_definitions(-DGETTEXT_DOMAIN=\"${GETTEXT_DOMAIN}\")

include_directories(.)
# TODO(mblaha) workround for dnf5daemon-client using server's headers, fix
# TODO(mblaha) workaround for dnf5daemon-client using server's headers, fix
include_directories(..)

pkg_check_modules(SDBUS_CPP REQUIRED sdbus-c++)
Expand Down
2 changes: 1 addition & 1 deletion dnf5daemon-client/callbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace dnfdaemon::client {


bool DbusCallback::signature_valid(sdbus::Signal & signal) {
// check that signal is emited by the correct session object
// check that signal is emitted by the correct session object
std::string object_path;
signal >> object_path;
return object_path == context.get_session_object_path();
Expand Down
2 changes: 1 addition & 1 deletion dnf5daemon-client/commands/remove/remove.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void RemoveCommand::set_argument_parser() {
specs_arg->set_description("List of packages to remove");
cmd.register_positional_arg(specs_arg);

// run remove command allways with allow_erasing on
// run remove command always with allow_erasing on
context.allow_erasing.set(libdnf5::Option::Priority::RUNTIME, true);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ along with libdnf. If not, see <https://www.gnu.org/licenses/>.
- severity: list of strings
Consider only advisories of given severity. Possible values are "critical", "important", "moderate", "low", and "none".
- reference_bz: list of strings
Consider only advisories referencing given Bugzilla ticket ID. Exepcted values are numeric IDs, e.g. 123456.
Consider only advisories referencing given Bugzilla ticket ID. Expected values are numeric IDs, e.g. 123456.
- reference_cve: list of strings
Consider only advisoried referencing given CVE ID. Expected values are strings IDs in CVE format, e.g. CVE-2201-0123.
- with_bz: boolean
Expand Down
4 changes: 2 additions & 2 deletions dnf5daemon-server/dbus/interfaces/org.rpm.dnf.v0.Base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ along with libdnf. If not, see <https://www.gnu.org/licenses/>.
<interface name="org.rpm.dnf.v0.Base">
<!--
read_all_repos:
@retval: `true` if repositories were successfuly loaded, `false` otherwise.
@retval: `true` if repositories were successfully loaded, `false` otherwise.

Explicitely ask for loading repositories metadata.
Explicitly ask for loading repositories metadata.
-->
<method name="read_all_repos">
<arg name="retval" type="b" direction="out"/>
Expand Down
2 changes: 1 addition & 1 deletion dnf5daemon-server/services/advisory/advisory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ libdnf5::advisory::AdvisoryQuery Advisory::advisory_query_from_options(
auto advisories_not_installed(advisories);
advisories.filter_packages(package_query, libdnf5::sack::QueryCmp::LTE);
// TODO(mblaha): add advisories.filter_packages(package_query), without cmp,
// to filter advisories with matching name.arch? Insted of unioning LTE
// to filter advisories with matching name.arch? Instead of unioning LTE
// and GT results.
advisories_not_installed.filter_packages(package_query, libdnf5::sack::QueryCmp::GT);
advisories |= advisories_not_installed;
Expand Down
6 changes: 3 additions & 3 deletions dnf5daemon-server/services/goal/goal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ along with libdnf. If not, see <https://www.gnu.org/licenses/>.

void Goal::dbus_register() {
auto dbus_object = session.get_dbus_object();
// TODO(mblaha) Adjust resolve method to accomodate also groups, environments,
// TODO(mblaha) Adjust resolve method to accommodate also groups, environments,
// and modules as part of the transaction
dbus_object->registerMethod(
dnfdaemon::INTERFACE_GOAL, "resolve", "a{sv}", "a(sssa{sv}a{sv})u", [this](sdbus::MethodCall call) -> void {
Expand Down Expand Up @@ -135,7 +135,7 @@ sdbus::MethodReply Goal::resolve(sdbus::MethodCall & call) {
environment_to_map(tsenv.get_environment(), grp_attrs)));
}
// there are transactions resolved without problems but still resolve_logs
// may contain some warnings / informations
// may contain some warnings / information
if (transaction.get_resolve_logs().size() > 0) {
overall_result = dnfdaemon::ResolveResult::WARNING;
} else {
Expand Down Expand Up @@ -254,7 +254,7 @@ sdbus::MethodReply Goal::do_transaction(sdbus::MethodCall & call) {
static_cast<std::underlying_type_t<libdnf5::base::Transaction::TransactionRunResult>>(rpm_result)));
}

// TODO(mblaha): clean up downloaded packages after successfull transaction
// TODO(mblaha): clean up downloaded packages after successful transaction

auto reply = call.createReply();
return reply;
Expand Down
2 changes: 1 addition & 1 deletion dnf5daemon-server/services/repo/repo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ dnfdaemon::KeyValueMap repo_to_map(
dbus_repo.emplace(attr, libdnf_repo->get_content_tags());
break;
case RepoAttribute::distro_tags: {
// sdbus::Variant cannot accomodate a std::pair
// sdbus::Variant cannot accommodate a std::pair
std::vector<std::string> distro_tags{};
for (auto & dt : libdnf_repo->get_distro_tags()) {
distro_tags.emplace_back(dt.first);
Expand Down
2 changes: 1 addition & 1 deletion doc/best_practices/documentation_strings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Example::
/// @param text Input text.
/// @param delimiter A delimiter we're using to split the text.
/// @param max_items Limit number of splits to produce a vector containing up to `max_items` items.
/// @return Splitted text.
/// @return Split text.
/// A continuation line for the return value description.
/// @exception std::out_of_range Value of the `max_items` argument is out of expected range.
/// @since 5.0
Expand Down
4 changes: 2 additions & 2 deletions doc/commands/repoquery.8.rst
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ Set what information is displayed about each package. The following are mutually
| * ``provides`` - Display capabilities provided by the package. Separated by new lines.
| * ``reason`` - Display reason why the packages was installed.
| * ``recommends`` - Display capabilities recommended by the package. Separated by new lines.
| * ``regular_requires`` - Display capabilities requried by the package without its ``%pre``, ``%post``, ``%preun`` and ``%postun`` requirements. Separated by new lines.
| * ``regular_requires`` - Display capabilities required by the package without its ``%pre``, ``%post``, ``%preun`` and ``%postun`` requirements. Separated by new lines.
| * ``release`` - Display release of the package.
| * ``repoid`` - Display id of repository the package is in.
| * ``reponame`` - Display name of repository the package is in.
| * ``requires`` - Display capabilities requried by the package (combines regular_requires and requires_pre).
| * ``requires`` - Display capabilities required by the package (combines regular_requires and requires_pre).
| * ``requires_pre`` - For an installed package display capabilities that it depends on to run its ``%pre``, ``%post``, ``%preun`` and ``%postun`` scripts. For not installed package display just ``%pre`` and ``$post`` requirements. Separated by new lines.
| * ``source_debug_name`` - Display name of debuginfo package for source package of the package.
| * ``source_name`` - Display source RPM name of the package.
Expand Down
2 changes: 1 addition & 1 deletion doc/dnf5.conf-todo.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ This section does not track any deprecated option. For such options see :ref:`De
``diskspacecheck``
:ref:`boolean <boolean-label>`

If enabled, controls wheather rpm shoud check available disk space during the transaction.
If enabled, controls whether rpm should check available disk space during the transaction.

Default: ``True``.

Expand Down
Loading
Loading