From 8eebdd8ee5a7d0e5eab398908c51c3c2a312bcbe Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 19 Nov 2017 20:19:48 +0100 Subject: gen_fast*: Make metadata/{glsa,news} valid top-level Manifests --- utils/gen_fast_manifest.py | 4 ++++ utils/gen_fast_metamanifest.py | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/gen_fast_manifest.py b/utils/gen_fast_manifest.py index f4e4bbe..320b682 100755 --- a/utils/gen_fast_manifest.py +++ b/utils/gen_fast_manifest.py @@ -102,6 +102,10 @@ def gen_manifest(top_dir): compat_mode = generate_manifest_entries(manifest_entries, top_dir) manifest_entries.sort() + # do not compress files which we want valid top-level Manifests + if top_dir.endswith('metadata/glsa') or top_dir.endswith('metadata/news'): + compat_mode = True + manifest_data = b'\n'.join(manifest_entries) + b'\n' if len(manifest_data) > 4096 and not compat_mode: with gzip.GzipFile(os.path.join(top_dir, 'Manifest.gz'), 'wb') as f: diff --git a/utils/gen_fast_metamanifest.py b/utils/gen_fast_metamanifest.py index 60fdc76..a696d0d 100755 --- a/utils/gen_fast_metamanifest.py +++ b/utils/gen_fast_metamanifest.py @@ -80,8 +80,14 @@ IGNORE packages gen_fast_manifest.gen_manifest('.') # write timestamp + ts = datetime.datetime.utcnow().strftime( + 'TIMESTAMP %Y-%m-%dT%H:%M:%SZ\n').encode('ascii') + with io.open('metadata/glsa/Manifest', 'ab') as f: + f.write(ts) + with io.open('metadata/news/Manifest', 'ab') as f: + f.write(ts) with io.open('Manifest', 'ab') as f: - f.write(datetime.datetime.utcnow().strftime('TIMESTAMP %Y-%m-%dT%H:%M:%SZ\n').encode('ascii')) + f.write(ts) if __name__ == '__main__': -- cgit v1.2.3