From c2e7f407678c6afecbec98acb2ae6949014ce8d2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 1 Mar 2022 00:43:06 +0100 Subject: [PATCH] Fix typos --- 3rdparty/lmdb-safe | 2 +- libpkg/data/database.cpp | 12 ++++++------ libpkg/data/storage.cpp | 2 +- libpkg/tests/data.cpp | 6 +++--- libpkg/tests/parser.cpp | 2 +- librepomgr/buildactions/buildaction.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/3rdparty/lmdb-safe b/3rdparty/lmdb-safe index f6fd781..4580d72 160000 --- a/3rdparty/lmdb-safe +++ b/3rdparty/lmdb-safe @@ -1 +1 @@ -Subproject commit f6fd78155b0a4fd229b1b352fe87efed2460d982 +Subproject commit 4580d7242ad2c1c56582c6ee25e2227bfc6166e7 diff --git a/libpkg/data/database.cpp b/libpkg/data/database.cpp index 3dc6417..98d90d2 100644 --- a/libpkg/data/database.cpp +++ b/libpkg/data/database.cpp @@ -634,17 +634,17 @@ void PackageUpdaterPrivate::update(const PackageCache::StoreResult &res, const s void PackageUpdaterPrivate::update(const StorageID packageID, bool removed, const std::shared_ptr &package) { addDependency(packageID, Dependency(package->name, package->version), removed, affectedProvidedDeps); - for (const auto &dependeny : package->provides) { - addDependency(packageID, dependeny, removed, affectedProvidedDeps); + for (const auto &dependency : package->provides) { + addDependency(packageID, dependency, removed, affectedProvidedDeps); } for (const auto &lib : package->libprovides) { addLibrary(packageID, lib, removed, affectedProvidedLibs); } - for (const auto &dependeny : package->dependencies) { - addDependency(packageID, dependeny, removed, affectedRequiredDeps); + for (const auto &dependency : package->dependencies) { + addDependency(packageID, dependency, removed, affectedRequiredDeps); } - for (const auto &dependeny : package->optionalDependencies) { - addDependency(packageID, dependeny, removed, affectedRequiredDeps); + for (const auto &dependency : package->optionalDependencies) { + addDependency(packageID, dependency, removed, affectedRequiredDeps); } for (const auto &lib : package->libdepends) { addLibrary(packageID, lib, removed, affectedRequiredLibs); diff --git a/libpkg/data/storage.cpp b/libpkg/data/storage.cpp index 7ae69ba..28bd9b7 100644 --- a/libpkg/data/storage.cpp +++ b/libpkg/data/storage.cpp @@ -88,7 +88,7 @@ auto StorageCache::retrieve(Storage & template auto StorageCache::retrieve(Storage &storage, RWTxn *txn, const std::string &entryName) -> SpecType { - // do not attempt to fetch empty entries (apprently can lead to "Getting data: MDB_BAD_VALSIZE: Unsupported size of key/DB name/data, or wrong DUPFIXED size") + // do not attempt to fetch empty entries (apparently can lead to "Getting data: MDB_BAD_VALSIZE: Unsupported size of key/DB name/data, or wrong DUPFIXED size") if (entryName.empty()) { return SpecType(0, std::shared_ptr()); } diff --git a/libpkg/tests/data.cpp b/libpkg/tests/data.cpp index 23226fb..0d61e75 100644 --- a/libpkg/tests/data.cpp +++ b/libpkg/tests/data.cpp @@ -224,7 +224,7 @@ void DataTests::testPackageSearch() auto [db, pkg, packageID] = m_config.findPackage(Dependency("foo")); CPPUNIT_ASSERT_EQUAL_MESSAGE("expected package for dependency returned", m_pkgId1, packageID); CPPUNIT_ASSERT_EQUAL_MESSAGE("find package returns the package from the first database", &m_config.databases.front(), std::get(db)); - // FIXME: check whether packge is actually (value) equivalent + // FIXME: check whether package is actually (value) equivalent pkgs = m_config.findPackages("bar"sv); CPPUNIT_ASSERT_EQUAL(1_st, pkgs.size()); @@ -243,12 +243,12 @@ void DataTests::testPackageSearch() pkgs = m_config.findPackages(Dependency("foo", "5.8-1", DependencyMode::GreatherEqual)); CPPUNIT_ASSERT_EQUAL(1_st, pkgs.size()); CPPUNIT_ASSERT_EQUAL(m_pkgId2, pkgs.front().id); - // FIXME: check whether packge is actually (value) equivalent + // FIXME: check whether package is actually (value) equivalent pkgs = m_config.findPackages(Dependency("bar", "5.5-1", DependencyMode::Equal)); CPPUNIT_ASSERT_EQUAL(1_st, pkgs.size()); CPPUNIT_ASSERT_EQUAL(m_pkgId2, pkgs.front().id); - // FIXME: check whether packge is actually (value) equivalent + // FIXME: check whether package is actually (value) equivalent pkgs = m_config.findPackages(Dependency("bar", "5.8-1", DependencyMode::Equal)); CPPUNIT_ASSERT_EQUAL(0_st, pkgs.size()); diff --git a/libpkg/tests/parser.cpp b/libpkg/tests/parser.cpp index e73b91e..b700413 100644 --- a/libpkg/tests/parser.cpp +++ b/libpkg/tests/parser.cpp @@ -248,7 +248,7 @@ void ParserTests::testParsingSplitPackageSrcInfoWithDifferentArchs() CPPUNIT_ASSERT_EQUAL_MESSAGE("base archs", std::vector{ "x86_64"s }, jre->sourceInfo->archs); CPPUNIT_ASSERT_EQUAL_MESSAGE("jre archs (empty, base applies)", std::vector{}, jre->archs); CPPUNIT_ASSERT_EQUAL_MESSAGE("jdk archs (empty, base applies)", std::vector{}, jdk->archs); - CPPUNIT_ASSERT_EQUAL_MESSAGE("jdk-doc archs (overidden)", std::vector{ "any"s }, doc->archs); + CPPUNIT_ASSERT_EQUAL_MESSAGE("jdk-doc archs (overridden)", std::vector{ "any"s }, doc->archs); } void ParserTests::testParsingPkgInfo() diff --git a/librepomgr/buildactions/buildaction.cpp b/librepomgr/buildactions/buildaction.cpp index 3f544ec..f1eed50 100644 --- a/librepomgr/buildactions/buildaction.cpp +++ b/librepomgr/buildactions/buildaction.cpp @@ -372,7 +372,7 @@ LibPkg::StorageID BuildAction::conclude(BuildActionResult result) // note: Not cleaning up the follow-up actions here because at some point I might implement recursive restarting. } - // detatch build process sessions + // detach build process sessions if (const auto lock = std::unique_lock(m_outputSessionMutex); m_outputSession) { m_outputSession->writeEnd(); // tell clients waiting for output that it's over m_outputSession.reset();