209 # update verbosity/interactive/report_untrusted settings |
209 # update verbosity/interactive/report_untrusted settings |
210 if section is None or section == 'ui': |
210 if section is None or section == 'ui': |
211 if name is None or name in ('quiet', 'verbose', 'debug'): |
211 if name is None or name in ('quiet', 'verbose', 'debug'): |
212 self.verbosity_constraints() |
212 self.verbosity_constraints() |
213 if name is None or name == 'interactive': |
213 if name is None or name == 'interactive': |
214 self.interactive = self.configbool("ui", "interactive", None) |
214 interactive = self.configbool("ui", "interactive", None) |
215 if self.interactive is None: |
215 if interactive is None and self.interactive: |
216 self.interactive = self.isatty() |
216 self.interactive = self.isatty() |
|
217 else: |
|
218 self.interactive = interactive |
217 if name is None or name == 'report_untrusted': |
219 if name is None or name == 'report_untrusted': |
218 self.report_untrusted = ( |
220 self.report_untrusted = ( |
219 self.configbool("ui", "report_untrusted", True)) |
221 self.configbool("ui", "report_untrusted", True)) |
220 |
222 |
221 # update trust information |
223 # update trust information |
404 return raw_input(prompt) |
406 return raw_input(prompt) |
405 |
407 |
406 def prompt(self, msg, pat=None, default="y", matchflags=0): |
408 def prompt(self, msg, pat=None, default="y", matchflags=0): |
407 if not self.interactive: return default |
409 if not self.interactive: return default |
408 try: |
410 try: |
409 r = self.readline(msg + ' ') |
411 r = self._readline(msg + ' ') |
410 if not pat or re.match(pat, r, matchflags): |
412 if not pat or re.match(pat, r, matchflags): |
411 return r |
413 return r |
412 else: |
414 else: |
413 self.write(_("unrecognized response\n")) |
415 self.write(_("unrecognized response\n")) |
414 except EOFError: |
416 except EOFError: |