On Apr 19, 2011, at 15:32 , Neels Hofmeyr wrote: > On Mon, 2011-04-18 at 19:47 -0400, Greg Stein wrote: >> Applied in r1094816. >> >> On Mon, Apr 18, 2011 at 18:44, Greg Stein <gst...@gmail.com> wrote: >>> On Mon, Apr 18, 2011 at 07:04, Alan Wood <alan.w...@clear.net.nz> wrote: >>>> Hi devs, >>>> I have just been looking at running the benchmarks and have got to the >>>> stage where I can >>>> run it on windows. >>>> >>>> This attached patch fixes three issues with the script: >>>> 1) use of file:// when I'm sure that file:/// is correct from previous >>>> discussions on this list > > This particular change is not necessary -- code extract with > annotations: > > base = tempfile.mkdtemp() # base == '/tmp/dir123' > repos = j(base, 'repos') # repos == '/tmp/dir123/repos' > file_url = 'file://%s' % repos # file_url == 'file://' + '/tmp/...' > > With your change, file_url becomes file:////tmp/..., which is still > valid, but nonsense :) (BTW, the script would not have worked if there > had been only two slashes.)
On Windows, the path returned by mkdtemp() is something like C:\users\billga~1\appdata\local\temp\tmpfoobar with no leading slash, so an extra slash makes the URL valid. The directory path could even have spaces in it, if the user wishes. For a geeky script like this, we don't have to be paranoid. Steve > > Thanks for your patch, Alan! > > ~Neels > >>>> 2) make sure no \ end up is repos url file:// >>>> 3) at error handler to rmtree to handle the windows read-only files. >>>> >>>> I have removed the "which svn" command, not sure how to do this so it is >>>> only removed on >>>> windows as I'm not really a python person. >>>> I hope this is useful. >>>> I haven't provided a log message as I don't really think it can be applied >>>> without a bit of >>>> editing. >>> >>> Yes, it will certainly be useful. Thanks! >>> >>> I'll fold your changes into the scripts. It is handy because I don't >>> have a Windows machine for testing. Please go ahead and continue >>> sending your patches to the list! >>> >>> (or if you'd like, we can offer you direct commit access to the >>> suite1/ directory) >>> >>> Cheers, >>> -g >>> > > -- Stephen Butler | Senior Consultant elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany tel: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
