saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 01:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add ~ when building RC packages

Browse source
This commit is contained in:
Megan Wilhite 2023-02-28 15:59:08 -07:00 • committed by Pedro Algarvio
parent c2f997ad8a
commit 09d1d56786
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/changelog.py
View file

@ -202,17 +202,18 @@ def update_rpm(ctx: Context, salt_version: Version, draft: bool = False):
if salt_version is None: if salt_version is None:
salt_version = _get_salt_version(ctx) salt_version = _get_salt_version(ctx)
changes = _get_pkg_changelog_contents(ctx, salt_version) 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( orig = ctx.run(
"sed", "sed",
f"s/Version: .*/Version: {salt_version}/g", f"s/Version: .*/Version: {str_salt_version}/g",
"pkg/rpm/salt.spec", "pkg/rpm/salt.spec",
capture=True, capture=True,
check=True, check=True,
).stdout.decode() ).stdout.decode()
dt = datetime.datetime.utcnow() dt = datetime.datetime.utcnow()
date = dt.strftime("%a %b %d %Y") date = dt.strftime("%a %b %d %Y")
header = f"* {date} Salt Project Packaging <saltproject-packaging@vmware.com> - {salt_version}\n" header = f"* {date} Salt Project Packaging <saltproject-packaging@vmware.com> - {str_salt_version}\n"
parts = orig.split("%changelog") parts = orig.split("%changelog")
tmpspec = "pkg/rpm/salt.spec.1" tmpspec = "pkg/rpm/salt.spec.1"
with open(tmpspec, "w") as wfp: with open(tmpspec, "w") as wfp: