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

Show amended upstream version correctly

This commit is contained in:
Martchus 2023-09-03 22:09:28 +02:00
parent c816972a16
commit 91ee500b0a
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpkg/parser/utils.cpp
View File

@ -262,7 +262,7 @@ static void overrideOverriddenVariableAssignment(string &pkgbuildContents, strin
*/
AmendedVersions amendPkgbuild(const string &path, const PackageVersion &existingVersion, const PackageAmendment &amendment)
{
AmendedVersions amendedVersions;
auto amendedVersions = AmendedVersions();
if (amendment.isEmpty()) {
return amendedVersions;
}
@ -273,6 +273,7 @@ AmendedVersions amendPkgbuild(const string &path, const PackageVersion &existing
if (amendment.setUpstreamVersion) {
static const auto pkgverRegex = regex{ "\npkgver=[^\n]*", regex::extended };
pkgbuildContents = regex_replace(pkgbuildContents, pkgverRegex, "\npkgver=" + existingVersion.upstream);
amendedVersions.newUpstreamVersion = existingVersion.upstream;
}
// bump downstream version

1
libpkg/parser/utils.h
View File

@ -76,6 +76,7 @@ struct LIBPKG_EXPORT PackageAmendment {
};
struct LIBPKG_EXPORT AmendedVersions {
std::string newUpstreamVersion;
std::string newPkgRel;
std::string newEpoch;
};

3
libpkg/tests/utils.cpp
View File

@ -79,8 +79,9 @@ void UtilsTests::testAmendingPkgbuild()
PackageAmendment{ .bumpDownstreamVersion = PackageAmendment::VersionBump::Epoch });
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 });
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);
const auto pkgbuildWithQuotingPath = workingCopyPath("perl-data-dumper-concise/PKGBUILD");
amendPkgbuild(pkgbuildWithQuotingPath, PackageVersion{ .upstream = "2.023", .package = "1" },

3
librepomgr/buildactions/preparebuild.cpp
View File

@ -784,6 +784,9 @@ void PrepareBuild::bumpVersions()
if (!amendedVersions.newEpoch.empty()) {
newVersion.epoch = std::move(amendedVersions.newEpoch);
}
if (!amendedVersions.newUpstreamVersion.empty()) {
newVersion.upstream = std::move(amendedVersions.newUpstreamVersion);
}
if (!amendedVersions.newPkgRel.empty()) {
newVersion.package = std::move(amendedVersions.newPkgRel);
}