Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply clang-format

This commit is contained in:
Martchus 2023-11-08 16:09:11 +01:00
parent c31027fc7f
commit e108c98826
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpkg/tests/utils.cpp
View File

@ -79,7 +79,8 @@ void UtilsTests::testAmendingPkgbuild()
PackageAmendment{ .bumpDownstreamVersion = PackageAmendment::VersionBump::Epoch });
CPPUNIT_ASSERT_EQUAL_MESSAGE("epoch bumped, pkgrel reset", readFile(testFilePath("c++utilities/PKGBUILD.newepoch")), readFile(pkgbuildPath));
auto amendment = amendPkgbuild(pkgbuildPath, PackageVersion{ .upstream = "5.0.2", .package = "3" }, PackageAmendment{ .setUpstreamVersion = true });
auto amendment
= 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));
CPPUNIT_ASSERT_EQUAL_MESSAGE("new upstream version returned", "5.0.2"s, amendment.newUpstreamVersion);

6
librepomgr/buildactions/preparebuild.cpp
View File

@ -768,11 +768,13 @@ void PrepareBuild::bumpVersions()
if (package->decomposeName().isVcsPackage()) {
amendment.setUpstreamVersion = true;
amendment.bumpDownstreamVersion = LibPkg::PackageAmendment::VersionBump::PackageVersion;
m_warnings.emplace_back("Bumping pkgver and pkgrel of VCS package " % package->name % "; its version " % package->version % " is older than existing version "
m_warnings.emplace_back("Bumping pkgver and pkgrel of VCS package " % package->name % "; its version " % package->version
% " is older than existing version "
+ existingVersionStr);
} else {
amendment.bumpDownstreamVersion = LibPkg::PackageAmendment::VersionBump::Epoch;
m_warnings.emplace_back("Bumping epoch of " % package->name % "; its version " % package->version % " is older than existing version "
m_warnings.emplace_back(
"Bumping epoch of " % package->name % "; its version " % package->version % " is older than existing version "
+ existingVersionStr);
goto breakLoop;
}