Fix typos
This commit is contained in:
parent
79123e4cd9
commit
c2e7f40767
|
@ -1 +1 @@
|
|||
Subproject commit f6fd78155b0a4fd229b1b352fe87efed2460d982
|
||||
Subproject commit 4580d7242ad2c1c56582c6ee25e2227bfc6166e7
|
|
@ -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> &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);
|
||||
|
|
|
@ -88,7 +88,7 @@ auto StorageCache<StorageEntriesType, StorageType, SpecType>::retrieve(Storage &
|
|||
template <typename StorageEntriesType, typename StorageType, typename SpecType>
|
||||
auto StorageCache<StorageEntriesType, StorageType, SpecType>::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<Entry>());
|
||||
}
|
||||
|
|
|
@ -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<Database *>(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());
|
||||
|
|
|
@ -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<std::string>{}, jre->archs);
|
||||
CPPUNIT_ASSERT_EQUAL_MESSAGE("jdk archs (empty, base applies)", std::vector<std::string>{}, 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()
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue