From 49aebdd8a5910fc283b621bc72769986998547cc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 3 Jul 2021 19:59:57 +0200 Subject: [PATCH] Fix typos found via `codespell --skip .git -w` --- README.md | 10 ++++---- libpkg/CMakeLists.txt | 2 +- libpkg/algo/buildorder.cpp | 2 +- libpkg/data/package.h | 10 ++++---- libpkg/parser/binary.cpp | 2 +- libpkg/parser/config.cpp | 2 +- libpkg/parser/utils.cpp | 4 ++-- libpkg/tests/data.cpp | 24 +++++++++---------- libpkg/tests/parser.cpp | 2 +- libpkg/tests/utils.cpp | 2 +- librepomgr/CMakeLists.txt | 2 +- librepomgr/buildactions/buildactionprivate.h | 2 +- librepomgr/buildactions/conductbuild.cpp | 2 +- librepomgr/buildactions/preparebuild.cpp | 16 ++++++------- .../reloadlibrarydependencies.cpp | 2 +- librepomgr/buildactions/repomanagement.cpp | 2 +- librepomgr/serversetup.cpp | 14 +++++------ librepomgr/tests/buildactions.cpp | 2 +- librepomgr/webapi/routes_buildaction.cpp | 4 ++-- pacfind/main.cpp | 2 +- srv/static/index.html | 2 +- srv/static/js/buildactionspage.js | 4 ++-- 22 files changed, 57 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 956ff14..1593351 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Repository manager and build tool for Arch Linux -This **experimental** project contains **inofficial** tools to manage custom Arch Linux +This **experimental** project contains **unofficial** tools to manage custom Arch Linux repositories. It is built on top of the official tools provided by the `pacman` and `devtools` packages. @@ -245,7 +245,7 @@ editing the presets JSON file (e.g. `/etc/buildservice-git/presets.json` in the packages are considered as newer by pacman. A warning is logged when bumping is done. * Missing dependencies are pulled into the build automatically. Whether dependencies are considered "missing" or "given" depends on the specified databases (see next points). - * Packages will be splitted into batches. The first batch contains all packages which can be + * Packages will be split into batches. The first batch contains all packages which can be built immediately. The second batch contains all packages which only depend on packages in the first batch. The third batch contains all packages which only depend on packages in the second batch and so on. That means packages do not need to be specified in the correct order. @@ -254,9 +254,9 @@ editing the presets JSON file (e.g. `/etc/buildservice-git/presets.json` in the * Cyclic dependencies can not be added to a batch. A list of cyclic "leftovers" is emitted if those exist and that is considered a failure. If this is the case you need to add a bootstrap package to break the cycle. The build system is not clever enough to pull a bootstrap - package automatically into the build so it must be specified explicitely. E.g. to build + package automatically into the build so it must be specified explicitly. E.g. to build `mingw-w64-freetype2` and `mingw-w64-harfbuzz` one needs to add `mingw-w64-freetype2-bootstrap` - explicitely to the list of packages to be built. + explicitly to the list of packages to be built. * Specify exactly one destination database. The built packages are added to this database. * Specify source databases. * All packages contained by the source databases are considered as "given" and not pulled @@ -303,7 +303,7 @@ editing the presets JSON file (e.g. `/etc/buildservice-git/presets.json` in the 1. Clean the `src` directory within "directory" for the package(s) or use "Clean source directory" if all packages need fixing. 2. Restart step 1. Existing sources are reused (except for the removed `src` directories) so it shouldn't - take long. The build progress (`hasSources` in particular) of the affected package(s) should be resetted. + take long. The build progress (`hasSources` in particular) of the affected package(s) should be reset. 3. Restart step 2. * or: Amend the PKGBUILD within the `src` directory. 1. Set `hasSources` back to `false` as mentioned under 2. to retrigger building the source directory. diff --git a/libpkg/CMakeLists.txt b/libpkg/CMakeLists.txt index 4fd69a6..011e362 100644 --- a/libpkg/CMakeLists.txt +++ b/libpkg/CMakeLists.txt @@ -36,7 +36,7 @@ set(TEST_SRC_FILES tests/cppunit.cpp tests/parser.cpp tests/parser_binary.cpp te set(META_PROJECT_NAME libpkg) set(META_PROJECT_TYPE library) set(META_PROJECT_VARNAME LIBPKG) -set(META_APP_NAME "Inofficial Arch Linux package library") +set(META_APP_NAME "Unofficial Arch Linux package library") set(META_APP_DESCRIPTION "C++ library to parse Arch Linux packages and databases") set(META_VERSION_MAJOR 0) set(META_VERSION_MINOR 0) diff --git a/libpkg/algo/buildorder.cpp b/libpkg/algo/buildorder.cpp index efc9053..0c67d4a 100644 --- a/libpkg/algo/buildorder.cpp +++ b/libpkg/algo/buildorder.cpp @@ -82,7 +82,7 @@ bool Config::addDepsRecursivelyInTopoOrder(vector> &all return false; } - // add package to the "current chain" (used to comprehend the path in case a cycle occured) + // add package to the "current chain" (used to comprehend the path in case a cycle occurred) cycleTracking.emplace_back(packageSearchResult); // add topo sort item for dependency diff --git a/libpkg/data/package.h b/libpkg/data/package.h index 59b8612..ad5e4df 100644 --- a/libpkg/data/package.h +++ b/libpkg/data/package.h @@ -23,7 +23,7 @@ namespace LibPkg { /*! - * \brief The InstallStatus enum specifies whether a package has been installed explicitely or as dependency. + * \brief The InstallStatus enum specifies whether a package has been installed explicitly or as dependency. */ enum class InstallStatus { Explicit = 0, AsDependency = 1, Unknown = 20 }; @@ -212,7 +212,7 @@ enum class PackageVersionComparison { LIBPKG_EXPORT std::ostream &operator<<(std::ostream &o, const PackageVersionComparison &res); /*! - * \brief The ComparsionResult enum defines possible results of the package version part comparsion + * \brief The ComparsionResult enum defines possible results of the package version part comparison * provided by PackageVersion::compareParts(). */ enum class PackageVersionPartComparison { @@ -230,7 +230,7 @@ struct LIBPKG_EXPORT PackageVersion : public ReflectiveRapidJSON::JsonSerializab static std::string trimPackageVersion(const std::string &versionString); PackageVersionComparison compare(const PackageVersion &other) const; static PackageVersionComparison compare(const std::string &versionString1, const std::string &versionString2); - static bool isNewer(PackageVersionComparison comparision); + static bool isNewer(PackageVersionComparison comparison); std::string toString() const; std::string epoch; @@ -248,9 +248,9 @@ inline PackageVersionComparison PackageVersion::compare(const std::string &versi return fromString(versionString1).compare(fromString(versionString2)); } -inline bool PackageVersion::isNewer(PackageVersionComparison comparision) +inline bool PackageVersion::isNewer(PackageVersionComparison comparison) { - return comparision == PackageVersionComparison::SoftwareUpgrade || comparision == PackageVersionComparison::PackageUpgradeOnly; + return comparison == PackageVersionComparison::SoftwareUpgrade || comparison == PackageVersionComparison::PackageUpgradeOnly; } /*! diff --git a/libpkg/parser/binary.cpp b/libpkg/parser/binary.cpp index 5814254..65db8f8 100644 --- a/libpkg/parser/binary.cpp +++ b/libpkg/parser/binary.cpp @@ -694,7 +694,7 @@ std::uint64_t Binary::readElfAddress(BinaryReader &reader) case BinaryClass::Class32Bit: return isBigEndian ? reader.readUInt32BE() : reader.readUInt32LE(); default: - throw runtime_error("Inavlid binary class"); + throw runtime_error("Invalid binary class"); } } diff --git a/libpkg/parser/config.cpp b/libpkg/parser/config.cpp index a2504ba..c86a819 100644 --- a/libpkg/parser/config.cpp +++ b/libpkg/parser/config.cpp @@ -112,7 +112,7 @@ void Config::loadPacmanConfig(const char *pacmanConfigPath) includedFile.open(path, ios_base::in); includedIni.parse(includedFile); } catch (const ios_base::failure &) { - cerr << Phrases::WarningMessage << "An IO error occured when parsing the included file \"" << path << "\"." + cerr << Phrases::WarningMessage << "An IO error occurred when parsing the included file \"" << path << "\"." << Phrases::EndFlush; } } diff --git a/libpkg/parser/utils.cpp b/libpkg/parser/utils.cpp index dd37834..9286dd5 100644 --- a/libpkg/parser/utils.cpp +++ b/libpkg/parser/utils.cpp @@ -60,7 +60,7 @@ void walkThroughArchiveInternal(struct archive *ar, const string &archiveName, c // get permissions const mode_t perm = archive_entry_perm(entry); - // add directories explicitely to get the entire tree though skipping irrelevant files + // add directories explicitly to get the entire tree though skipping irrelevant files if (entryType == AE_IFDIR) { // remove trailing slashes const char *dirEnd = filePath; @@ -160,7 +160,7 @@ void walkThroughArchive( { // open archive file using libarchive if (archivePath.empty()) { - throw std::runtime_error("Unable to open archive: no path specificed"); + throw std::runtime_error("Unable to open archive: no path specified"); } struct archive *ar = archive_read_new(); archive_read_support_filter_all(ar); diff --git a/libpkg/tests/data.cpp b/libpkg/tests/data.cpp index d170213..dad9898 100644 --- a/libpkg/tests/data.cpp +++ b/libpkg/tests/data.cpp @@ -149,9 +149,9 @@ void DataTests::testDependencyMatching() dep.mode = DependencyMode::Equal; CPPUNIT_ASSERT_MESSAGE("equal constraint, direct match", pkg.providesDependency(dep)); dep.mode = DependencyMode::GreatherEqual; - CPPUNIT_ASSERT_MESSAGE("greather equal constraint, no match", pkg.providesDependency(dep)); + CPPUNIT_ASSERT_MESSAGE("greater equal constraint, no match", pkg.providesDependency(dep)); dep.mode = DependencyMode::GreatherThan; - CPPUNIT_ASSERT_MESSAGE("greather constraint, no match", !pkg.providesDependency(dep)); + CPPUNIT_ASSERT_MESSAGE("greater constraint, no match", !pkg.providesDependency(dep)); dep.mode = DependencyMode::LessEqual; CPPUNIT_ASSERT_MESSAGE("less equal constraint, match", pkg.providesDependency(dep)); dep.mode = DependencyMode::LessThan; @@ -160,33 +160,33 @@ void DataTests::testDependencyMatching() pkg.version += '0'; CPPUNIT_ASSERT_MESSAGE("equal constraint, no match", !pkg.providesDependency(dep)); dep.mode = DependencyMode::GreatherEqual; - CPPUNIT_ASSERT_MESSAGE("greather equal constraint, direct match", pkg.providesDependency(dep)); + CPPUNIT_ASSERT_MESSAGE("greater equal constraint, direct match", pkg.providesDependency(dep)); pkg.version = "123.4"; - CPPUNIT_ASSERT_MESSAGE("greather equal constraint, direct match", pkg.providesDependency(dep)); + CPPUNIT_ASSERT_MESSAGE("greater equal constraint, direct match", pkg.providesDependency(dep)); dep.name = "foo"; - CPPUNIT_ASSERT_MESSAGE("greather equal constraint, indirect match", pkg.providesDependency(dep)); + CPPUNIT_ASSERT_MESSAGE("greater equal constraint, indirect match", pkg.providesDependency(dep)); Package pkg2; pkg2.name = "crypto++"; pkg2.version = "5.6.5-1"; const char *depStr = "crypto++=5.6.5-1"; CPPUNIT_ASSERT_MESSAGE("name with plus signs", pkg2.providesDependency(Dependency::fromString(depStr, 8))); - CPPUNIT_ASSERT_MESSAGE("equal constraint with explicitely specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 16))); + CPPUNIT_ASSERT_MESSAGE("equal constraint with explicitly specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 16))); CPPUNIT_ASSERT_MESSAGE("equal constraint, default pkgrel should match", pkg2.providesDependency(Dependency::fromString(depStr, 14))); Package pkg3; pkg3.name = "crypto++"; pkg3.version = "5.6.5-2"; CPPUNIT_ASSERT_MESSAGE("equal constraint, any pkgrel should match", pkg3.providesDependency(Dependency::fromString(depStr, 14))); CPPUNIT_ASSERT_MESSAGE( - "equal constraint with explicitely specified pkgrel must not match", !pkg3.providesDependency(Dependency::fromString(depStr, 16))); + "equal constraint with explicitly specified pkgrel must not match", !pkg3.providesDependency(Dependency::fromString(depStr, 16))); depStr = "crypto++>=5.6.5-1"; CPPUNIT_ASSERT_MESSAGE( - "greather equal constraint with explicitely specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 17))); - CPPUNIT_ASSERT_MESSAGE("greather equal constraint, default pkgrel should match", pkg2.providesDependency(Dependency::fromString(depStr, 15))); - CPPUNIT_ASSERT_MESSAGE("greather equal constrainer, any pkgrel should match", pkg3.providesDependency(Dependency::fromString(depStr, 15))); + "greater equal constraint with explicitly specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 17))); + CPPUNIT_ASSERT_MESSAGE("greater equal constraint, default pkgrel should match", pkg2.providesDependency(Dependency::fromString(depStr, 15))); + CPPUNIT_ASSERT_MESSAGE("greater equal constrainer, any pkgrel should match", pkg3.providesDependency(Dependency::fromString(depStr, 15))); CPPUNIT_ASSERT_MESSAGE( - "greather equal constraint with explicitely specified pkgrel must match", pkg3.providesDependency(Dependency::fromString(depStr, 17))); + "greater equal constraint with explicitly specified pkgrel must match", pkg3.providesDependency(Dependency::fromString(depStr, 17))); pkg3.name = "sphinxbase"; pkg3.version = "5prealpha-11.1aBc"; @@ -249,7 +249,7 @@ void DataTests::testComputingFileName() pkg.packageInfo->arch = "x86_64"; CPPUNIT_ASSERT_EQUAL_MESSAGE("file name computed from name, version and arch", "test-1.2-3-x86_64.pkg.tar.zst"s, pkg.computeFileName()); pkg.packageInfo->fileName = "explicitely-specified-filename"; - CPPUNIT_ASSERT_EQUAL_MESSAGE("explicitely specified filename returned", "explicitely-specified-filename"s, pkg.computeFileName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("explicitly specified filename returned", "explicitly-specified-filename"s, pkg.computeFileName()); } void DataTests::testDetectingUnresolved() diff --git a/libpkg/tests/parser.cpp b/libpkg/tests/parser.cpp index 25ad75b..0c67400 100644 --- a/libpkg/tests/parser.cpp +++ b/libpkg/tests/parser.cpp @@ -303,7 +303,7 @@ void ParserTests::testParsingSignatureLevel() void ParserTests::testSerializingDatabaseSignatureLevel() { CPPUNIT_ASSERT_EQUAL_MESSAGE( - "defaut signature level", SignatureLevelConfig(SignatureLevel::Default), SignatureLevelConfig::fromString(std::string_view())); + "default signature level", SignatureLevelConfig(SignatureLevel::Default), SignatureLevelConfig::fromString(std::string_view())); CPPUNIT_ASSERT_EQUAL_MESSAGE( "invalid signature level", SignatureLevelConfig(SignatureLevel::Invalid), SignatureLevelConfig::fromString("foo bar")); CPPUNIT_ASSERT_EQUAL_MESSAGE( diff --git a/libpkg/tests/utils.cpp b/libpkg/tests/utils.cpp index 7315258..58d4b16 100644 --- a/libpkg/tests/utils.cpp +++ b/libpkg/tests/utils.cpp @@ -77,7 +77,7 @@ void UtilsTests::testAmendingPkgbuild() amendPkgbuild(pkgbuildPath, PackageVersion{ .upstream = "5.0.2", .package = "3" }, PackageAmendment{ .bumpDownstreamVersion = PackageAmendment::VersionBump::Epoch }); - CPPUNIT_ASSERT_EQUAL_MESSAGE("epoch bumped, pkgrel resetted", readFile(testFilePath("c++utilities/PKGBUILD.newepoch")), readFile(pkgbuildPath)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("epoch bumped, pkgrel reset", readFile(testFilePath("c++utilities/PKGBUILD.newepoch")), readFile(pkgbuildPath)); amendPkgbuild(pkgbuildPath, PackageVersion{ .upstream = "5.0.2", .package = "3" }, PackageAmendment{ .setUpstreamVersion = true }); CPPUNIT_ASSERT_EQUAL_MESSAGE("upstream version set", readFile(testFilePath("c++utilities/PKGBUILD.newpkgver")), readFile(pkgbuildPath)); diff --git a/librepomgr/CMakeLists.txt b/librepomgr/CMakeLists.txt index 69d5d1a..a8992a7 100644 --- a/librepomgr/CMakeLists.txt +++ b/librepomgr/CMakeLists.txt @@ -66,7 +66,7 @@ set(META_PROJECT_NAME librepomgr) set(META_PROJECT_TYPE library) set(META_PROJECT_VARNAME LIBREPOMGR) set(META_APP_AUTHOR "Martchus") -set(META_APP_NAME "Inofficial Arch Linux repository management library") +set(META_APP_NAME "Unofficial Arch Linux repository management library") set(META_APP_DESCRIPTION "Library for managing custom Arch Linux repositories") set(META_VERSION_MAJOR 0) set(META_VERSION_MINOR 0) diff --git a/librepomgr/buildactions/buildactionprivate.h b/librepomgr/buildactions/buildactionprivate.h index abaf621..479a714 100644 --- a/librepomgr/buildactions/buildactionprivate.h +++ b/librepomgr/buildactions/buildactionprivate.h @@ -124,7 +124,7 @@ struct LIBREPOMGR_EXPORT OutputBufferingForSession { std::atomic_bool existingOutputSent = false; }; -/// \brief The BuildProcessSession class spawns a process assoicated with a build action. +/// \brief The BuildProcessSession class spawns a process associated with a build action. /// The process output is make available as a logfile of the build action allowing live-steaming. class LIBREPOMGR_EXPORT BuildProcessSession : public std::enable_shared_from_this, public BaseProcessSession { public: diff --git a/librepomgr/buildactions/conductbuild.cpp b/librepomgr/buildactions/conductbuild.cpp index 0ccc629..0e23ddb 100644 --- a/librepomgr/buildactions/conductbuild.cpp +++ b/librepomgr/buildactions/conductbuild.cpp @@ -333,7 +333,7 @@ void ConductBuild::run() } setupReadLock.unlock(); - // fill ommitted build progress configuration with defaults from global config + // fill omitted build progress configuration with defaults from global config if (m_autoStaging && m_buildPreparation.stagingDb.empty()) { reportError("Auto-staging is enabled but no staging database has been specified in build-preparation.json."); return; diff --git a/librepomgr/buildactions/preparebuild.cpp b/librepomgr/buildactions/preparebuild.cpp index 6742478..750cb54 100644 --- a/librepomgr/buildactions/preparebuild.cpp +++ b/librepomgr/buildactions/preparebuild.cpp @@ -196,7 +196,7 @@ void PrepareBuild::run() // -> The existing version is useful to know when we need to bump pkgrel or even epoch. size_t currentIndex = 0; for (const auto &packageName : m_buildAction->packageNames) { - // pick some package matching the specified packageName which has a source info; prefering packages + // pick some package matching the specified packageName which has a source info; preferring packages // from the destination db auto existingPackages = m_setup.config.findPackages(packageName); auto foundSourcePackage = false; @@ -229,7 +229,7 @@ void PrepareBuild::run() break; } } - // add an empty BuildPackage neverthless assuming packageName specifies the base package as-is + // add an empty BuildPackage nevertheless assuming packageName specifies the base package as-is if (!foundSourcePackage) { packageBuildData.specifiedIndex = currentIndex++; m_buildDataByPackage[packageName] = std::move(packageBuildData); @@ -297,7 +297,7 @@ bool PrepareBuild::isExistingPackageRelevant( } packageBuildData.existingPackages.emplace_back(package.pkg); } - // skip if packge is not from any database available within that build + // skip if package is not from any database available within that build return (m_baseDbs.empty() && dependencyPresentInRequiredDbs) || (m_baseDbs.find(db->name) != m_baseDbs.end()); } @@ -489,7 +489,7 @@ void PrepareBuild::fetchMissingBuildData() bool PrepareBuild::pullFurtherDependencies(const std::vector &dependencies) { - // pull further depencencies; similar to initial dependency lookup in run() + // pull further dependencies; similar to initial dependency lookup in run() auto dependencyAdded = false; const auto *const destinationDb = *m_destinationDbs.begin(); for (const auto &dependency : dependencies) { @@ -613,7 +613,7 @@ void BatchItem::determineNeededItems(LibPkg::Config &config, const std::unordere auto foundPackage = false; const auto existingPackages = config.findPackages(dependency); for (const auto &package : existingPackages) { - // skip if packge is not from any database available within that build + // skip if package is not from any database available within that build const auto *const db = std::get(package.db); if (requiredDbs.find(db->name) == requiredDbs.end()) { continue; @@ -693,7 +693,7 @@ void BatchItem::addNeededBatchItemsForPackage(LibPkg::Config &config, const std: auto foundPackage = false; const auto existingPackages = config.findPackages(dep); for (const auto &existingPackage : existingPackages) { - // skip if packge is not from any database available within that build + // skip if package is not from any database available within that build const auto *const db = std::get(existingPackage.db); if (requiredDbs.find(db->name) == requiredDbs.end()) { continue; @@ -753,7 +753,7 @@ void PrepareBuild::bumpVersions() if (package->decomposeName().isVcsPackage()) { // skip bumping epoch of VCS packages; the pkgver is supposed to be adjusted in pkgver() // note: Not skipping this in the pkgrel handling in the case above because when pkgver() returns a new version, pkgrel is - // resetted automatically so there's no harm in bumping it and it might actually be needed if there's no no version. + // reset automatically so there's no harm in bumping it and it might actually be needed if there's no no version. m_warnings.emplace_back("Version of package " % package->name % " is" % package->version % " which is older than existing version " % existingVersionStr + "; NOT bumping the epoch because it is a VCS package; be sure pkgver() actually yields a new version"); @@ -977,7 +977,7 @@ void PrepareBuild::computeBatches() } } if (!cyclicLeftovers.empty()) { - m_warnings.emplace_back("Dependency cycles have been detected. Add a boostrap package to the package list to resolve this."); + m_warnings.emplace_back("Dependency cycles have been detected. Add a bootstrap package to the package list to resolve this."); } } diff --git a/librepomgr/buildactions/reloadlibrarydependencies.cpp b/librepomgr/buildactions/reloadlibrarydependencies.cpp index 6eec07e..f215944 100644 --- a/librepomgr/buildactions/reloadlibrarydependencies.cpp +++ b/librepomgr/buildactions/reloadlibrarydependencies.cpp @@ -156,7 +156,7 @@ void ReloadLibraryDependencies::run() PackageToConsider{ .path = std::move(path), .url = std::move(url), .lastModified = lastModified }); // create a temporary package object to hold the info parsed from the .PKGINFO file relevantPkg.info.name = package->name; - // -> assing certain fields which are used by addDepsAndProvidesFromOtherPackage() to check whether the packages are matching + // -> assign certain fields which are used by addDepsAndProvidesFromOtherPackage() to check whether the packages are matching relevantPkg.info.version = package->version; relevantPkg.info.packageInfo = std::make_unique(); relevantPkg.info.packageInfo->buildDate = package->packageInfo->buildDate; diff --git a/librepomgr/buildactions/repomanagement.cpp b/librepomgr/buildactions/repomanagement.cpp index 3364f2d..b8ebb7f 100644 --- a/librepomgr/buildactions/repomanagement.cpp +++ b/librepomgr/buildactions/repomanagement.cpp @@ -651,7 +651,7 @@ void CleanRepository::run() }(); #endif throw std::runtime_error( - "multiple/ambigous *.db files present: " + joinStrings(dbFileNames, ", ")); + "multiple/ambiguous *.db files present: " + joinStrings(dbFileNames, ", ")); } // initialize temporary database object for the repository auto &db = otherDbs.emplace_back(std::make_unique(dbFilePaths.front().stem(), dbFilePaths.front())); diff --git a/librepomgr/serversetup.cpp b/librepomgr/serversetup.cpp index 0e5d72b..4ce5f9f 100644 --- a/librepomgr/serversetup.cpp +++ b/librepomgr/serversetup.cpp @@ -268,7 +268,7 @@ void ServiceSetup::loadConfigFiles(bool restoreStateAndDiscardDatabases) } } } catch (const ios_base::failure &) { - cerr << Phrases::WarningMessage << "An IO error occured when parsing \"" << configFilePath << "\", using defaults" << Phrases::EndFlush; + cerr << Phrases::WarningMessage << "An IO error occurred when parsing \"" << configFilePath << "\", using defaults" << Phrases::EndFlush; } // restore state/cache and discard databases if not done yet @@ -281,9 +281,9 @@ void ServiceSetup::loadConfigFiles(bool restoreStateAndDiscardDatabases) try { config.loadPacmanConfig(pacmanConfigFilePath.data()); } catch (const ios_base::failure &e) { - cerr << Phrases::ErrorMessage << "An IO error occured when loading pacman config: " << e.what() << Phrases::EndFlush; + cerr << Phrases::ErrorMessage << "An IO error occurred when loading pacman config: " << e.what() << Phrases::EndFlush; } catch (const runtime_error &e) { - cerr << Phrases::ErrorMessage << "An error occured when loading pacman config: " << e.what() << Phrases::EndFlush; + cerr << Phrases::ErrorMessage << "An error occurred when loading pacman config: " << e.what() << Phrases::EndFlush; } // add databases declared in config @@ -485,9 +485,9 @@ std::size_t ServiceSetup::restoreState() cerr << Phrases::SubMessage << "Restored build actions from cache file 😌" << Phrases::EndFlush; } } catch (const ConversionException &) { - cerr << Phrases::WarningMessage << "A conversion error occured when restoring cache file \"" << cacheFilePath << "\"." << Phrases::EndFlush; + cerr << Phrases::WarningMessage << "A conversion error occurred when restoring cache file \"" << cacheFilePath << "\"." << Phrases::EndFlush; } catch (const ios_base::failure &) { - cerr << Phrases::WarningMessage << "An IO error occured when restoring cache file \"" << cacheFilePath << "\"." << Phrases::EndFlush; + cerr << Phrases::WarningMessage << "An IO error occurred when restoring cache file \"" << cacheFilePath << "\"." << Phrases::EndFlush; } // restore build actions from JSON file @@ -573,7 +573,7 @@ std::size_t ServiceSetup::saveState() cacheFile.close(); cerr << Phrases::SuccessMessage << "Wrote cache file \"" << cacheFilePath << "\", " << dataSizeToString(size) << Phrases::EndFlush; } catch (const ios_base::failure &) { - cerr << Phrases::WarningMessage << "An IO error occured when dumping the cache file \"" << cacheFilePath << "\"." << Phrases::EndFlush; + cerr << Phrases::WarningMessage << "An IO error occurred when dumping the cache file \"" << cacheFilePath << "\"." << Phrases::EndFlush; } // write build actions to a JSON file to be able to restore build actions even if the cache file can not be used due to version mismatch @@ -661,7 +661,7 @@ void ServiceSetup::Locks::clear() for (auto i = m_locksByName.begin(), end = m_locksByName.end(); i != end;) { if (auto lock2 = i->second.tryLockToWrite(log, std::string(i->first)); lock2.lock()) { // check whether nobody holds the lock anymore lock2.lock().unlock(); // ~shared_mutex(): The behavior is undefined if the mutex is owned by any thread [...]. - m_locksByName.erase(i++); // we can be sure no other thead aquires i->second in the meantime because we're holding m_mutex + m_locksByName.erase(i++); // we can be sure no other thead acquires i->second in the meantime because we're holding m_mutex } else { ++i; } diff --git a/librepomgr/tests/buildactions.cpp b/librepomgr/tests/buildactions.cpp index 793ab3a..7adcfde 100644 --- a/librepomgr/tests/buildactions.cpp +++ b/librepomgr/tests/buildactions.cpp @@ -96,7 +96,7 @@ void BuildActionsTests::tearDown() /*! * \brief Assigns certain build variables to use fake scripts (instead of invoking e.g. the real makepkg). - * \remarks The fake scripts are esentially no-ops which merely print the script name and the passed arguments. + * \remarks The fake scripts are essentially no-ops which merely print the script name and the passed arguments. */ void BuildActionsTests::loadBasicTestSetup() { diff --git a/librepomgr/webapi/routes_buildaction.cpp b/librepomgr/webapi/routes_buildaction.cpp index 86f6911..334a3f1 100644 --- a/librepomgr/webapi/routes_buildaction.cpp +++ b/librepomgr/webapi/routes_buildaction.cpp @@ -435,11 +435,11 @@ void postBuildActionsFromTask(const Params ¶ms, ResponseHandler &&handler, c // show error when parameters are specified which are only supposed to be specified when starting a single build action if (!params.target.value("source-repo").empty()) { - handler(makeBadRequest(params.request(), "the source repo can not be explicitely specified when a task is specified")); + handler(makeBadRequest(params.request(), "the source repo can not be explicitly specified when a task is specified")); return; } if (!params.target.value("destination-repo").empty()) { - handler(makeBadRequest(params.request(), "the destination repo can not be explicitely specified when a task is specified")); + handler(makeBadRequest(params.request(), "the destination repo can not be explicitly specified when a task is specified")); return; } diff --git a/pacfind/main.cpp b/pacfind/main.cpp index 1d71b58..19206e5 100644 --- a/pacfind/main.cpp +++ b/pacfind/main.cpp @@ -29,7 +29,7 @@ int main(int argc, const char *argv[]) loadPacmanConfigArg.setCombinable(true); ConfigValueArgument pacmanConfigPathArg("pacman-config-path", '\0', "specifies the path of the pacman config file", { "path" }); loadPacmanConfigArg.setSubArguments({ &pacmanConfigPathArg }); - ConfigValueArgument fileNameArg("file-name", 'f', "specifies the file name to seach for", { "name" }); + ConfigValueArgument fileNameArg("file-name", 'f', "specifies the file name to search for", { "name" }); fileNameArg.setImplicit(true); fileNameArg.setRequired(true); Argument regexArg("regex", 'r', "use regex to match the file name (--file-name is considered a regex)"); diff --git a/srv/static/index.html b/srv/static/index.html index 04eafb9..ded8103 100644 --- a/srv/static/index.html +++ b/srv/static/index.html @@ -36,7 +36,7 @@ Logo Repository Manager for Arch Linux
- Inofficial tool to build packages and manage repositories + Unofficial tool to build packages and manage repositories