310 |
310 |
311 def configitems(self, section, untrusted=False): |
311 def configitems(self, section, untrusted=False): |
312 items = self._configitems(section, untrusted=untrusted, abort=True) |
312 items = self._configitems(section, untrusted=untrusted, abort=True) |
313 if self.debugflag and not untrusted and self.ucdata: |
313 if self.debugflag and not untrusted and self.ucdata: |
314 uitems = self._configitems(section, untrusted=True, abort=False) |
314 uitems = self._configitems(section, untrusted=True, abort=False) |
315 keys = uitems.keys() |
315 for k in util.sort(uitems): |
316 keys.sort() |
|
317 for k in keys: |
|
318 if uitems[k] != items.get(k): |
316 if uitems[k] != items.get(k): |
319 self.warn(_("Ignoring untrusted configuration option " |
317 self.warn(_("Ignoring untrusted configuration option " |
320 "%s.%s = %s\n") % (section, k, uitems[k])) |
318 "%s.%s = %s\n") % (section, k, uitems[k])) |
321 x = items.items() |
319 return util.sort(items.items()) |
322 x.sort() |
|
323 return x |
|
324 |
320 |
325 def walkconfig(self, untrusted=False): |
321 def walkconfig(self, untrusted=False): |
326 cdata = self._get_cdata(untrusted) |
322 cdata = self._get_cdata(untrusted) |
327 sections = cdata.sections() |
323 sections = cdata.sections() |
328 sections.sort() |
324 sections.sort() |