From e108c98826a1930789b3af62206f082d365431e0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 8 Nov 2023 16:09:11 +0100 Subject: [PATCH] Apply clang-format --- libpkg/tests/utils.cpp | 3 ++- librepomgr/buildactions/preparebuild.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpkg/tests/utils.cpp b/libpkg/tests/utils.cpp index eb5b466..8b922e9 100644 --- a/libpkg/tests/utils.cpp +++ b/libpkg/tests/utils.cpp @@ -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); diff --git a/librepomgr/buildactions/preparebuild.cpp b/librepomgr/buildactions/preparebuild.cpp index 51b9359..0ce2c89 100644 --- a/librepomgr/buildactions/preparebuild.cpp +++ b/librepomgr/buildactions/preparebuild.cpp @@ -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; }