summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-02-11 02:14:01 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-02-11 02:14:01 (GMT)
commit0b77413d3c1e19477446d58f41a4093316753ef9 (patch)
treeafbf35a8104eb520df8c9cd73e25b240e99b0866 /bin
parenta3e66db3f093c947ae4a080e1890cbfd831a6c83 (diff)
downloadSCons-0b77413d3c1e19477446d58f41a4093316753ef9.zip
SCons-0b77413d3c1e19477446d58f41a4093316753ef9.tar.gz
SCons-0b77413d3c1e19477446d58f41a4093316753ef9.tar.bz2
Fixed post release mode
Diffstat (limited to 'bin')
-rw-r--r--bin/update-release-info.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 1c83506..9c8efdd 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -194,7 +194,7 @@ class UpdateFile(object):
# Determine the pattern to match a version
_rel_types = r'(dev|beta|candidate|final)'
- match_pat = r'\d+\.\d+\.\d+\.' + _rel_types + r'\.(\d+|yyyymmdd)'
+ match_pat = r'\d+\.\d+\.\d+\.' + _rel_types + r'\.?(\d+|yyyymmdd)'
match_rel = re.compile(match_pat)
def __init__(self, file, orig=None):
@@ -254,7 +254,9 @@ def main(args, rel_info):
minor = rel_info.version_tuple[1] + 1
micro = 0
new_tuple = (rel_info.version_tuple[0], minor, micro, 'dev', 0)
- new_version = '.'.join(map(str, new_tuple[:4])) + '.yyyymmdd'
+ new_version = '.'.join(map(str, new_tuple[:4])) + 'yyyymmdd'
+
+ rel_info.version_string = new_version
# Update ReleaseConfig
@@ -276,7 +278,7 @@ def main(args, rel_info):
t = UpdateFile(os.path.join('src', 'RELEASE.txt'),
os.path.join('template', 'RELEASE.txt'))
if DEBUG: t.file = '/tmp/RELEASE.txt'
- t.replace_version(new_version)
+ t.replace_version()
# Update src/Announce.txt