From 9c698f7dd2ff18db72de3415c1fb6e08e048f952 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 24 Nov 2017 21:59:35 +0100 Subject: Fix wrong timestamp name for metadata/* --- gemato/profile.py | 2 +- tests/test_profile.py | 8 ++++---- utils/gen_fast_metamanifest.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gemato/profile.py b/gemato/profile.py index 91ac5ea..ae6e2c0 100644 --- a/gemato/profile.py +++ b/gemato/profile.py @@ -112,7 +112,7 @@ class EbuildRepositoryProfile(DefaultProfile): 'timestamp.x') elif relpath in ('metadata/dtd', 'metadata/glsa', 'metadata/news', 'metadata/xml-schema'): - return ('timestamp', 'timestamp.chk') + return ('timestamp.chk', 'timestamp.commit') return () def set_loader_options(self, loader): diff --git a/tests/test_profile.py b/tests/test_profile.py index 66c8f50..2b26114 100644 --- a/tests/test_profile.py +++ b/tests/test_profile.py @@ -109,14 +109,14 @@ class EbuildRepositoryTests(TempDirTestCase): 'metadata/timestamp.chk', 'metadata/timestamp.commit', 'metadata/timestamp.x', - 'metadata/dtd/timestamp', 'metadata/dtd/timestamp.chk', - 'metadata/glsa/timestamp', + 'metadata/dtd/timestamp.commit', 'metadata/glsa/timestamp.chk', - 'metadata/news/timestamp', + 'metadata/glsa/timestamp.commit', 'metadata/news/timestamp.chk', - 'metadata/xml-schema/timestamp', + 'metadata/news/timestamp.commit', 'metadata/xml-schema/timestamp.chk', + 'metadata/xml-schema/timestamp.commit', ] def test_get_entry_type_for_path(self): diff --git a/utils/gen_fast_metamanifest.py b/utils/gen_fast_metamanifest.py index 2c9a587..bd26c09 100755 --- a/utils/gen_fast_metamanifest.py +++ b/utils/gen_fast_metamanifest.py @@ -62,8 +62,8 @@ IGNORE timestamp.x ''') for mdir in ('dtd', 'glsa', 'news', 'xml-schema'): with io.open(os.path.join('metadata', mdir, 'Manifest'), 'wb') as f: - f.write(b'''IGNORE timestamp -IGNORE timestamp.chk + f.write(b'''IGNORE timestamp.chk +IGNORE timestamp.commit ''') with io.open('Manifest', 'wb') as f: f.write(b'''IGNORE distfiles -- cgit v1.2.3