From 09d1d56786f8b2b6d791ec2e21c46c4c0b696f9b Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Tue, 28 Feb 2023 15:59:08 -0700 Subject: [PATCH] Add ~ when building RC packages --- tools/changelog.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/changelog.py b/tools/changelog.py index 10c46ce3ac6..85fdbacb1bc 100644 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -202,17 +202,18 @@ def update_rpm(ctx: Context, salt_version: Version, draft: bool = False): if salt_version is None: salt_version = _get_salt_version(ctx) changes = _get_pkg_changelog_contents(ctx, salt_version) - ctx.info(f"Salt version is {salt_version}") + str_salt_version = str(salt_version).replace("rc", "~rc") + ctx.info(f"Salt version is {str_salt_version}") orig = ctx.run( "sed", - f"s/Version: .*/Version: {salt_version}/g", + f"s/Version: .*/Version: {str_salt_version}/g", "pkg/rpm/salt.spec", capture=True, check=True, ).stdout.decode() dt = datetime.datetime.utcnow() date = dt.strftime("%a %b %d %Y") - header = f"* {date} Salt Project Packaging - {salt_version}\n" + header = f"* {date} Salt Project Packaging - {str_salt_version}\n" parts = orig.split("%changelog") tmpspec = "pkg/rpm/salt.spec.1" with open(tmpspec, "w") as wfp: