/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/tests/script.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 23:07:18 UTC
  • mfrom: (4707.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090919230718-vm9zqiov9h3t9bzg
(vila) Fix some test regressions on OSX and FreeBSD

Show diffs side-by-side

added added

removed removed

Lines of Context:
349
349
            try:
350
350
                os.remove(p)
351
351
            except OSError, e:
352
 
                if e.errno == errno.EISDIR:
 
352
                # Various OSes raises different exceptions (linux: EISDIR,
 
353
                #   win32: EACCES, OSX: EPERM) when invoked on a directory
 
354
                if e.errno in (errno.EISDIR, errno.EPERM, errno.EACCES):
353
355
                    if recursive:
354
356
                        osutils.rmtree(p)
355
357
                    else: