Show More
@@ -142,15 +142,13 b' class ui(object):' | |||||
142 | for (section, name), value in self.overlay.iteritems(): |
|
142 | for (section, name), value in self.overlay.iteritems(): | |
143 | yield section, name, value |
|
143 | yield section, name, value | |
144 | seen[section, name] = 1 |
|
144 | seen[section, name] = 1 | |
145 |
|
|
145 | sections = self.cdata.sections() | |
146 | try: |
|
146 | sections.sort() | |
147 | for name, value in self.cdata.items(section): |
|
147 | for section in sections: | |
148 | if (section, name) in seen: continue |
|
148 | for name, value in self.configitems(section): | |
149 | yield section, name, value.replace('\n', '\\n') |
|
149 | if (section, name) in seen: continue | |
150 |
|
|
150 | yield section, name, value.replace('\n', '\\n') | |
151 | except ConfigParser.InterpolationError, inst: |
|
151 | seen[section, name] = 1 | |
152 | raise util.Abort(_("Error in configuration section [%s]:\n%s") |
|
|||
153 | % (section, inst)) |
|
|||
154 | if self.parentui is not None: |
|
152 | if self.parentui is not None: | |
155 | for parent in self.parentui.walkconfig(seen): |
|
153 | for parent in self.parentui.walkconfig(seen): | |
156 | yield parent |
|
154 | yield parent |
General Comments 0
You need to be logged in to leave comments.
Login now