Apply clang-format
This commit is contained in:
parent
c31027fc7f
commit
e108c98826
|
@ -79,7 +79,8 @@ void UtilsTests::testAmendingPkgbuild()
|
||||||
PackageAmendment{ .bumpDownstreamVersion = PackageAmendment::VersionBump::Epoch });
|
PackageAmendment{ .bumpDownstreamVersion = PackageAmendment::VersionBump::Epoch });
|
||||||
CPPUNIT_ASSERT_EQUAL_MESSAGE("epoch bumped, pkgrel reset", readFile(testFilePath("c++utilities/PKGBUILD.newepoch")), readFile(pkgbuildPath));
|
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("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);
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("new upstream version returned", "5.0.2"s, amendment.newUpstreamVersion);
|
||||||
|
|
||||||
|
|
|
@ -768,11 +768,13 @@ void PrepareBuild::bumpVersions()
|
||||||
if (package->decomposeName().isVcsPackage()) {
|
if (package->decomposeName().isVcsPackage()) {
|
||||||
amendment.setUpstreamVersion = true;
|
amendment.setUpstreamVersion = true;
|
||||||
amendment.bumpDownstreamVersion = LibPkg::PackageAmendment::VersionBump::PackageVersion;
|
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);
|
+ existingVersionStr);
|
||||||
} else {
|
} else {
|
||||||
amendment.bumpDownstreamVersion = LibPkg::PackageAmendment::VersionBump::Epoch;
|
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);
|
+ existingVersionStr);
|
||||||
goto breakLoop;
|
goto breakLoop;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue