Report from running bzr diff with difftools and tkdiff

[John Arbash Meinel]

Stephen Ward wrote:
> I get the same error with bzr 0.12 using other diff tools, so it isn't 
> specific to tkdiff.  So far, I haven't been able to reproduce this with any 
> case that diffs against something in the current working tree, only with 
> diffs between two old revisions.
> 
> Seems to be an interaction w/ lazy_import, in this case with mkdtemp from 
> bzrlib.osutils.
> 
> I'll take a closer look at this later today.
> 
> -- Steve
> 
> 

Attached is a simple fix, and a more future proof fix. The first one is
sufficient, but the other one helps to ensure if we change other
functions it won't break.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: difftools_1.patch
Type: text/x-patch
Size: 1310 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061109/77913aaa/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: difftools_2.patch
Type: text/x-patch
Size: 8114 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061109/77913aaa/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061109/77913aaa/attachment.pgp