diff options
| -rw-r--r-- | gemato/profile.py | 10 | ||||
| -rw-r--r-- | tests/test_profile.py | 2 | ||||
| -rwxr-xr-x | utils/gen_fast_metamanifest.py | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/gemato/profile.py b/gemato/profile.py index 9fca716..91ac5ea 100644 --- a/gemato/profile.py +++ b/gemato/profile.py @@ -94,8 +94,8 @@ class EbuildRepositoryProfile(DefaultProfile): if any(f.endswith('.ebuild') for f in filenames): return True # some standard directories worth separate Manifests - if spl[0] == 'metadata' and spl[1] in ('glsa', 'md5-cache', - 'news'): + if spl[0] == 'metadata' and spl[1] in ('dtd', 'glsa', + 'md5-cache', 'news', 'xml-schema'): return True elif len(spl) == 3: # metadata cache -> per-directory Manifests @@ -109,9 +109,9 @@ class EbuildRepositoryProfile(DefaultProfile): return ('distfiles', 'local', 'lost+found', 'packages') elif relpath == 'metadata': return ('timestamp', 'timestamp.chk', 'timestamp.commit', - 'timestamp.x', 'dtd/timestamp', 'dtd/timestamp.chk', - 'xml-schema/timestamp', 'xml-schema/timestamp.chk') - elif relpath in ('metadata/glsa', 'metadata/news'): + 'timestamp.x') + elif relpath in ('metadata/dtd', 'metadata/glsa', + 'metadata/news', 'metadata/xml-schema'): return ('timestamp', 'timestamp.chk') return () diff --git a/tests/test_profile.py b/tests/test_profile.py index 8848323..66c8f50 100644 --- a/tests/test_profile.py +++ b/tests/test_profile.py @@ -47,10 +47,12 @@ class EbuildRepositoryTests(TempDirTestCase): 'eclass/Manifest', 'licenses/Manifest', 'metadata/Manifest', + 'metadata/dtd/Manifest', 'metadata/glsa/Manifest', 'metadata/md5-cache/Manifest', 'metadata/md5-cache/dev-foo/Manifest', 'metadata/news/Manifest', + 'metadata/xml-schema/Manifest', 'profiles/Manifest', ] EXPECTED_TYPES = { diff --git a/utils/gen_fast_metamanifest.py b/utils/gen_fast_metamanifest.py index 58596ae..7247f67 100755 --- a/utils/gen_fast_metamanifest.py +++ b/utils/gen_fast_metamanifest.py @@ -35,9 +35,11 @@ def manifest_dir_generator(iter_n): if iter_n == 1: # few special metadata subdirectories + yield 'metadata/dtd' yield 'metadata/glsa' yield 'metadata/md5-cache' yield 'metadata/news' + yield 'metadata/xml-schema' # independent top-level dirs yield 'eclass' @@ -57,12 +59,8 @@ def gen_metamanifest(top_dir): IGNORE timestamp.chk IGNORE timestamp.commit IGNORE timestamp.x -IGNORE dtd/timestamp -IGNORE dtd/timestamp.chk -IGNORE xml-schema/timestamp -IGNORE xml-schema/timestamp.chk ''') - for mdir in ('glsa', 'news'): + 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 |