Browse Source

Fix typos found via `codespell --skip .git -w`

lmdb
Martchus 3 months ago
parent
commit
49aebdd8a5
  1. 10
      README.md
  2. 2
      libpkg/CMakeLists.txt
  3. 2
      libpkg/algo/buildorder.cpp
  4. 10
      libpkg/data/package.h
  5. 2
      libpkg/parser/binary.cpp
  6. 2
      libpkg/parser/config.cpp
  7. 4
      libpkg/parser/utils.cpp
  8. 24
      libpkg/tests/data.cpp
  9. 2
      libpkg/tests/parser.cpp
  10. 2
      libpkg/tests/utils.cpp
  11. 2
      librepomgr/CMakeLists.txt
  12. 2
      librepomgr/buildactions/buildactionprivate.h
  13. 2
      librepomgr/buildactions/conductbuild.cpp
  14. 16
      librepomgr/buildactions/preparebuild.cpp
  15. 2
      librepomgr/buildactions/reloadlibrarydependencies.cpp
  16. 2
      librepomgr/buildactions/repomanagement.cpp
  17. 14
      librepomgr/serversetup.cpp
  18. 2
      librepomgr/tests/buildactions.cpp
  19. 4
      librepomgr/webapi/routes_buildaction.cpp
  20. 2
      pacfind/main.cpp
  21. 2
      srv/static/index.html
  22. 4
      srv/static/js/buildactionspage.js

10
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.

2
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)

2
libpkg/algo/buildorder.cpp

@ -82,7 +82,7 @@ bool Config::addDepsRecursivelyInTopoOrder(vector<unique_ptr<TopoSortItem>> &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

10
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;
}
/*!

2
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");
}
}

2
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;
}
}

4
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);

24
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()

2
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(

2
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));

2
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)

2
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<BuildProcessSession>, public BaseProcessSession {
public:

2
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;

16
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<LibPkg::Dependency> &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<LibPkg::Database *>(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<LibPkg::Database *>(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.");
}
}

2
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<LibPkg::PackageInfo>();
relevantPkg.info.packageInfo->buildDate = package->packageInfo->buildDate;

2
librepomgr/buildactions/repomanagement.cpp

@ -651,7 +651,7 @@ void CleanRepository::run()
}();
#endif
throw std::runtime_error(
"multiple/ambigous *.db files present: " + joinStrings<decltype(dbFileNames), std::string>(dbFileNames, ", "));
"multiple/ambiguous *.db files present: " + joinStrings<decltype(dbFileNames), std::string>(dbFileNames, ", "));
}
// initialize temporary database object for the repository
auto &db = otherDbs.emplace_back(std::make_unique<LibPkg::Database>(dbFilePaths.front().stem(), dbFilePaths.front()));

14
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;
}

2
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()
{

4
librepomgr/webapi/routes_buildaction.cpp

@ -435,11 +435,11 @@ void postBuildActionsFromTask(const Params &params, 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;
}

2
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)");

2
srv/static/index.html

@ -36,7 +36,7 @@
<img src="img/logo.svg" alt="Logo" />
</a>
Repository Manager for Arch Linux<br />
<span><em>Inofficial</em> tool to build packages and manage repositories</span>
<span><em>Unofficial</em> tool to build packages and manage repositories</span>
</div>
<ul>
<li id="global-nav-link">

4
srv/static/js/buildactionspage.js

@ -542,7 +542,7 @@ function renderBuildActionDetailsTable(buildActionDetails)
},
},
});
case 7: { // reporitory problems
case 7: { // repository problems
const container = document.createElement('div');
container.className = 'repo-problems';
for (const [database, problems] of Object.entries(value.data)) {
@ -551,7 +551,7 @@ function renderBuildActionDetailsTable(buildActionDetails)
columnHeaders: ['Related package', 'Problem description'],
columnAccessors: ['pkg', 'desc'],
customRenderer: {
note: problems.length + ' problems in reporitory ' + database,
note: problems.length + ' problems in repository ' + database,
desc: function(value) {
switch(value.index) {
case 1:

Loading…
Cancel
Save