conf: Properly propagate whether a section is commented or not
authorTobias Brunner <tobias@strongswan.org>
Thu, 17 Apr 2014 17:06:34 +0000 (19:06 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 7 May 2014 13:48:16 +0000 (15:48 +0200)
conf/format-options.py

index fc6e6e1..e591f37 100755 (executable)
@@ -241,15 +241,16 @@ class ConfFormatter:
 
        def __print_section(self, section, indent, commented):
                """Print a section with all options"""
-               comment = "# " if commented or section.commented else ""
+               commented = commented or section.commented
+               comment = "# " if commented else ""
                self.__print_description(section, indent)
                print '{0}{1}{2} {{'.format(self.__indent * indent, comment, section.name)
                print
                for o in sorted(section.options, key=attrgetter('section')):
                        if o.section:
-                               self.__print_section(o, indent + 1, section.commented)
+                               self.__print_section(o, indent + 1, commented)
                        else:
-                               self.__print_option(o, indent + 1, section.commented)
+                               self.__print_option(o, indent + 1, commented)
                print '{0}{1}}}'.format(self.__indent * indent, comment)
                print