Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/ui.py @ 1483:a4ba63e04134
Fix traceback on bad system hgrc files
author | Soh Tk-r28629 <tksoh@freescale.com> |
---|---|
date | Mon, 31 Oct 2005 09:57:54 -0800 |
parents | 7d66ce9895fa |
children | 59b3639df0a9 |
line wrap: on
line diff
--- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -32,10 +32,13 @@ class ui: self.interactive = (self.interactive and interactive) def readconfig(self, fn): - try: - self.cdata.read(fn) - except ConfigParser.ParsingError, inst: - raise util.Abort(_("Failed to parse %s\n%s") % (fn, inst)) + if isinstance(fn, basestring): + fn = [fn] + for f in fn: + try: + self.cdata.read(f) + except ConfigParser.ParsingError, inst: + raise util.Abort(_("Failed to parse %s\n%s") % (f, inst)) def setconfig(self, section, name, val): self.overlay[(section, name)] = val