1 files changed, 14 insertions, 12 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index 94e02f942dc..86208b94261 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -744,22 +744,24 @@ def write_uncommented(target, f):
     A block is a sequence of non-empty lines separated by empty lines.
     """
     block = []
-    is_comment = True
+
+    def flush(last):
+        # If the block is entiry made of comments, ignore it
+        entire_block_comments = all(ln.startswith("#") or ln == "" for ln in block)
+        if not entire_block_comments and len(block) > 0:
+            for line in block:
+                f.write(line + "\n")
+            # Required to output a newline before the start of a new section
+            if last:
+                f.write("\n")
+        block.clear()
 
     for line in target:
         block.append(line)
         if len(line) == 0:
-            if not is_comment:
-                for ln in block:
-                    f.write(ln + "\n")
-            block = []
-            is_comment = True
-            continue
-        is_comment = is_comment and line.startswith("#")
-    # Write the last accumulated block
-    if len(block) > 0 and not is_comment:
-        for ln in block:
-            f.write(ln + "\n")
+            flush(last=False)
+
+    flush(last=True)
     return f