[PATCH] merge: do not try to delete several times the same directory

Dan Villiom Podlaski Christiansen danchr at gmail.com
Sun Nov 7 08:41:16 CST 2010


On 7 Nov 2010, at 14:50, Adrian Buehlmann wrote:

> On 07.11.2010 14:18, Nicolas Dumazet wrote:
>> 2010/11/7 Nicolas Dumazet <nicdumz at gmail.com>:
>>
>>> +                maybeempty.add(os.path.dirname(fn))
>>
>> Not perfect because os.path.dirname can raise OSError(EISDIR).
>
> Hmm. You say os.path.dirname can raise OSError(EISDIR).

Perhaps it's os.unlink() that can raise it? Judging from the  
implementations of os.path.dirname() in Python 2.4, Python 2.7 and  
PyPy 1.3, none of them access the filesystem in it, and thus won't  
raise an OSError.

--

Dan Villiom Podlaski Christiansen
danchr at gmail.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1943 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20101107/fe8bbfce/attachment.bin>


More information about the Mercurial-devel mailing list