1 |
commit: 0c06fc1d848f0b891b210778b2a99b7396aa8871 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 17:51:23 2020 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 17:54:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/metagen.git/commit/?id=0c06fc1d |
7 |
|
8 |
Get document type declaration back to a single |
9 |
|
10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
11 |
|
12 |
metagen/metagenerator.py | 8 +++++++- |
13 |
1 file changed, 7 insertions(+), 1 deletion(-) |
14 |
|
15 |
diff --git a/metagen/metagenerator.py b/metagen/metagenerator.py |
16 |
index e733997..c0b79d7 100755 |
17 |
--- a/metagen/metagenerator.py |
18 |
+++ b/metagen/metagenerator.py |
19 |
@@ -75,7 +75,13 @@ class MyMetadata: |
20 |
# Re-write indentation to tabulators |
21 |
# (for backwards compatibility and smaller diffs with existing files) |
22 |
reparsed = minidom.parseString(xml_text) |
23 |
- return reparsed.toprettyxml(indent='\t', encoding='UTF-8').decode() |
24 |
+ xml_text = reparsed.toprettyxml(indent='\t', encoding='UTF-8').decode() |
25 |
+ |
26 |
+ # Get doctype back on a single line |
27 |
+ # - for compatibility with output produced by metagen <0.7 |
28 |
+ # - to make pkgcheck stop from warning about PkgMetadataXmlIndentation |
29 |
+ return xml_text.replace('<!DOCTYPE pkgmetadata\n SYSTEM', |
30 |
+ '<!DOCTYPE pkgmetadata SYSTEM') |
31 |
|
32 |
|
33 |
def do_tests(): |