/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/transport/brokenrename.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/brokenrename.py
19
19
 
20
20
from __future__ import absolute_import
21
21
 
22
 
from .. import (
 
22
from bzrlib import (
23
23
        errors,
24
24
        urlutils,
25
25
        )
26
 
from . import decorator
 
26
from bzrlib.transport import decorator
27
27
 
28
28
 
29
29
class BrokenRenameTransportDecorator(decorator.TransportDecorator):
41
41
            if self._decorated.has(rel_to):
42
42
                rel_to = urlutils.join(rel_to, urlutils.basename(rel_from))
43
43
            self._decorated.rename(rel_from, rel_to)
44
 
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
 
44
        except (errors.DirectoryNotEmpty, errors.FileExists), e:
45
45
            # absorb the error
46
46
            return
47
47