/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Robert Collins
  • Date: 2005-10-20 04:08:12 UTC
  • mfrom: (1185.12.68)
  • Revision ID: robertc@robertcollins.net-20051020040812-fecd1bc32aa3478e
Merge from Aaron Bentley.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
331
331
    def __init__(self):
332
332
        BzrError.__init__(self, "Working tree has conflicts.")
333
333
 
 
334
class ParseConfigError(BzrError):
 
335
    def __init__(self, errors, filename):
 
336
        if filename is None:
 
337
            filename = ""
 
338
        message = "Error(s) parsing config file %s:\n%s" % \
 
339
            (filename, ('\n'.join(e.message for e in errors)))
 
340
        BzrError.__init__(self, message)
 
341
 
334
342
class SigningFailed(BzrError):
335
343
    def __init__(self, command_line):
336
344
        BzrError.__init__(self, "Failed to gpg sign data with command '%s'"