← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_readdir_pyx.pyx

  • Committer: Robert Collins
  • Date: 2010-05-21 03:28:43 UTC
  • mfrom: (4797.43.12 2.1)
  • mto: This revision was merged to the branch mainline in revision 5245.
  • Revision ID: robertc@robertcollins.net-20100521032843-9bc6ad9gxjodmoil
Merge 2.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_readdir_pyx.pyx
307
307
        if orig_dir_fd == -1:
308
308
            raise_os_error(errno, "open: ", ".")
309
309
        if -1 == chdir(path):
 
310
            # Ignore the return value, because we are already raising an
 
311
            # exception
 
312
            close(orig_dir_fd)
310
313
            raise_os_error(errno, "chdir: ", path)
311
314
    else:
312
315
        orig_dir_fd = -1