From 58b35c7bd4fa14b36e1de0ecbc5c72b8576c52d9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 20 Oct 2019 10:57:22 +0200 Subject: Use version as key for news entries --- extras/autowaf.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'extras') diff --git a/extras/autowaf.py b/extras/autowaf.py index 50e3728..bd38f52 100644 --- a/extras/autowaf.py +++ b/extras/autowaf.py @@ -654,7 +654,6 @@ def build_dox(bld, name, version, srcdir, blddir, outdir='', versioned=True): bld.path.get_bld().ant_glob('doc/man/man%d/*' % i, excl='**/_*')) - def build_version_files(header_path, source_path, domain, major, minor, micro): """Generate version code header""" header_path = os.path.abspath(header_path) @@ -1244,9 +1243,10 @@ def write_news(entries, out_file): if len(entries) == 0: return + revisions = sorted(entries.keys(), reverse=True) news = open(out_file, 'w') - for e in sorted(entries.keys(), reverse=True): - entry = entries[e] + for r in revisions: + entry = entries[r] news.write('%s (%s) %s;\n' % (entry['name'], entry['revision'], entry['status'])) for item in entry['items']: wrapped = textwrap.wrap(item, width=79) @@ -1269,9 +1269,8 @@ def write_posts(entries, meta, out_dir, status='stable'): except Exception: pass - for i in entries: - entry = entries[i] - revision = i[1] + for r, entry in entries.items(): + revision = entry['revision'] if entry['status'] != status: continue @@ -1375,7 +1374,9 @@ def get_news(in_file, entry_props={}): entry['blamee_name'] = matches.group(1) entry['blamee_mbox'] = matches.group(2) entry.update(entry_props) - entries[(entry['date'], entry['revision'])] = entry + + key = tuple(map(int, entry['revision'].split('.'))) + entries[key] = entry # Skip trailing blank line before next entry f.readline() -- cgit v1.2.1