From 2d402ed8c019838ac88305364fd5864421655537 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 13 Sep 2024 00:44:07 +0000 Subject: [PATCH] Revert "roomservice: Use ElementTree.indent()" Revert submission 402436 Reason for revert: Breaks build Reverted changes: /q/submissionid:402436 Change-Id: Ia53f8a2c2a39ee437c334c5157a2f7dc5aed44ac --- build/tools/roomservice.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py index bc860cae..835d792d 100755 --- a/build/tools/roomservice.py +++ b/build/tools/roomservice.py @@ -87,6 +87,22 @@ def exists_in_tree(lm, path): return True return False +# in-place prettyprint formatter +def indent(elem, level=0): + i = "\n" + level*" " + if len(elem): + if not elem.text or not elem.text.strip(): + elem.text = i + " " + if not elem.tail or not elem.tail.strip(): + elem.tail = i + for elem in elem: + indent(elem, level+1) + if not elem.tail or not elem.tail.strip(): + elem.tail = i + else: + if level and (not elem.tail or not elem.tail.strip()): + elem.tail = i + def get_manifest_path(): '''Find the current manifest path In old versions of repo this is at .repo/manifest.xml @@ -191,7 +207,7 @@ def add_to_manifest(repositories): print("Adding dependency: %s -> %s" % (project.attrib["name"], project.attrib["path"])) lm.append(project) - ElementTree.indent(lm) + indent(lm, 0) raw_xml = ElementTree.tostring(lm).decode() raw_xml = '\n' + raw_xml