~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/osutils.py

Committer: Robert Collins
Date: 2006-01-04 23:32:25 UTC
mfrom: (1185.50.38 bzr-jam-integration)
mto: (1185.85.11 bzr-encoding) (1534.1.2 integration) (1508.1.16 checkout) (1530.2.2 test-apis) (1551.1.1 bzr.merge.branch-formats) (1553.5.2 bzr.dev (Main development branch)) (1559.1.1 integration) (1556.1.2 versioned-file-new-repo-format) (1704.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1536.
Revision ID: robertc@robertcollins.net-20060104233225-7ce047eb1fca63ec

Merge from jam-integration.

files renamed:
bzrlib/tests/test_revision_info.py => bzrlib/tests/blackbox/test_revision_info.py

added added

removed removed

142

# RBC 20060103 abstraction leakage: the paramiko SFTP clients rename

143

# function raises an IOError with errno == None when a rename fails.

144

# This then gets caught here.

145

if e.errno is not None:

145

if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):

146

raise

147

except Exception, e:

148

if (not hasattr(e, 'errno')