~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2005-10-18 18:48:27 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: abentley@panoramicfeedback.com-20051018184827-2cc69376beb1cdf3
Switched to ConfigObj

Show diffs side-by-side

added added

removed removed

Lines of Context:
276
276
class ConflictsInTree(BzrError):
277
277
    def __init__(self):
278
278
        BzrError.__init__(self, "Working tree has conflicts.")
 
279
 
 
280
class ParseConfigError(BzrError):
 
281
    def __init__(self, errors, filename):
 
282
        if filename is None:
 
283
            filename = ""
 
284
        message = "Error(s) parsing config file %s:\n%s" % \
 
285
            (filename, ('\n'.join(e.message for e in errors)))
 
286
        BzrError.__init__(self, message)