bzr.dev temporarily broken

[John Arbash Meinel]

Martin Pool wrote:
> On Thu, 2006-01-05 at 11:31 -0600, John Arbash Meinel wrote:
> 
>>Hey Martin, I saw that you pulled in the new changes, which is great to
>>see. Unfortunately you pulled a little bit to early. :)
>>
>>Robert accidentally broke fancy_rename() in his integration branch.
>>Which I fixed in my integration branch, and he pulled yesterday. But it
>>seems he pulled the fix after you pulled his changes.
>>
>>Anyway, right for bzr.dev revision 1509, the test suite fails in a lot
>>of places with NoSuchFile errors.
>>
>>Merging against either of our integration branches again should fix the
>>problem.
> 
> 
> I did run the tests before pushing and they pass OK in my branch (591
> tests).   Which test was failing?
> 

Anything that was using fancy_rename, such as:

bzrlib.tests.test_permissions.TestSftpPermissions.test_new_files

The specific change is:

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py
+++ bzrlib/osutils.py
@@ -142,7 +142,7 @@
         # RBC 20060103 abstraction leakage: the paramiko SFTP clients
rename
         # function raises an IOError with errno == None when a rename
fails.
         # This then gets caught here.
-        if e.errno is not None:
+        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
             raise
     except Exception, e:
         if (not hasattr(e, 'errno')

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060105/ba97adfc/attachment.pgp