/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: 2008-04-04 00:02:23 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3332.
  • Revision ID: robertc@robertcollins.net-20080404000223-m270i246sp9uatmt
Fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
541
541
 
542
542
class InvalidURLJoin(PathError):
543
543
 
544
 
    _fmt = 'Invalid URL join request: "%(args)s"%(extra)s'
 
544
    _fmt = "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
545
545
 
546
 
    def __init__(self, msg, base, args):
547
 
        PathError.__init__(self, base, msg)
548
 
        self.args = [base] + list(args)
 
546
    def __init__(self, reason, base, join_args):
 
547
        self.reason = reason
 
548
        self.base = base
 
549
        self.join_args = join_args
 
550
        PathError.__init__(self, base, reason)
549
551
 
550
552
 
551
553
class UnknownHook(BzrError):