trewrite Suites to according stable/testing, implements new dict - amprolla - devuan's apt repo merger HTML git clone git://parazyd.org/amprolla.git DIR Log DIR Files DIR Refs DIR README DIR LICENSE --- DIR commit 90c91e5ee6a05a79d4457ebeebc69a30d856fe48 DIR parent 0b83b1bd2a2b3a48af5e4fd93eb6f697500ef240 HTML Author: parazyd <parazyd@dyne.org> Date: Wed, 28 Jun 2017 19:50:37 +0200 rewrite Suites to according stable/testing, implements new dict Diffstat: M lib/config.def.py | 14 ++++++++++++++ M lib/release.py | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) --- DIR diff --git a/lib/config.def.py b/lib/config.def.py t@@ -81,6 +81,20 @@ aliases = { } } +release_aliases = { + 'ascii': 'testing', + 'ascii-backports': 'testing-backports', + 'ascii-proposed-updates': 'testing-proposed-updates', + 'ascii-security': 'testing-security', + 'ascii-updates': 'testing-updates', + + 'jessie': 'stable', + 'jessie-backports': 'stable-backports', + 'jessie-proposed-updates': 'stable-proposed-updates', + 'jessie-security': 'stable-security', + 'jessie-updates': 'stable-updates', +} + categories = ['main', 'contrib', 'non-free'] arches = [ DIR diff --git a/lib/release.py b/lib/release.py t@@ -8,7 +8,7 @@ from datetime import datetime, timedelta from os.path import getsize, isfile import gnupg -from lib.config import checksums, release_keys, signingkey +from lib.config import checksums, release_aliases, release_keys, signingkey from lib.parse import parse_release_head t@@ -37,6 +37,11 @@ def write_release(oldrel, newrel, filelist, r, sign=True): rel_cont['Date'] = prettyt1 # rel_cont['Valid-Until'] = prettyt2 + # rewrite Suite to allow for being on stable/testing rather than + # jessie/ascii/... + if rel_cont['Suite'] in release_aliases: + rel_cont['Suite'] = release_aliases[rel_cont['Suite']] + for k in release_keys: if k in rel_cont: new.write('%s: %s\n' % (k, rel_cont[k]))