##// END OF EJS Templates
ui.config: fix bug in config alternatives from cc669e4fec95
Augie Fackler -
r19536:ab3cf677 default
parent child Browse files
Show More
@@ -176,7 +176,7 b' class ui(object):'
176 alternates = [name]
176 alternates = [name]
177
177
178 for n in alternates:
178 for n in alternates:
179 value = self._data(untrusted).get(section, name, None)
179 value = self._data(untrusted).get(section, n, None)
180 if value is not None:
180 if value is not None:
181 name = n
181 name = n
182 break
182 break
@@ -184,10 +184,11 b' class ui(object):'
184 value = default
184 value = default
185
185
186 if self.debugflag and not untrusted and self._reportuntrusted:
186 if self.debugflag and not untrusted and self._reportuntrusted:
187 uvalue = self._ucfg.get(section, name)
187 for n in alternates:
188 if uvalue is not None and uvalue != value:
188 uvalue = self._ucfg.get(section, n)
189 self.debug("ignoring untrusted configuration option "
189 if uvalue is not None and uvalue != value:
190 "%s.%s = %s\n" % (section, name, uvalue))
190 self.debug("ignoring untrusted configuration option "
191 "%s.%s = %s\n" % (section, n, uvalue))
191 return value
192 return value
192
193
193 def configpath(self, section, name, default=None, untrusted=False):
194 def configpath(self, section, name, default=None, untrusted=False):
General Comments 0
You need to be logged in to leave comments. Login now