[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svnadmin hotcopy bug?

From: eg <egoots_at_gmail.com>
Date: Thu, 09 Oct 2008 22:57:15 -0700

eg wrote:
> Neels J. Hofmeyr wrote:
>
>>
>> This indenting seems wrong. Please don't use tabs.
>
> There were/are no tabs in the patch??
>
> Is it possible that this got horked by my mailer (I used Thunderbird)?
>
>>
>> Furthermore, please create diffs against the root of your working
>> copy (i.e.
>> from trunk/), so that the full path to the modified file is listed (here
>> "tools/backup/hot-backup.py.in" instead of "hot-backup.py.in").
>>
>
> No problem. see below
>
>>
>> Well, I'd have fixed things myself and committed it if I understood the
>> patch. I don't, so I suggest you make the effort to fix the log
>> message to
>> briefly explain the actual change, and make a new diff against trunk.
>>
>
> So how is the following log message?
>
> [[[
>
> Fix an issue with using the --archive-type=zip option whereby any
> empty repository directories were not being zipped up.
>
> * tools/backup/hot-backup.py.in:
> Make the script include any empty directories into the archive by
> explicitly writing the directory names with a trailing backslash
> during the directory walking phase. This has no effect on the content
> for directories which already contain files.
>
> For references on this see:
> http://hiparrot.wordpress.com/2005/12/05/writing-an-empty-directory-into-a-zipfile/
>
> or
> http://coding.derkeiler.com/Archive/Python/comp.lang.python/2004-06/1486.html
>
>
>
> ]]]
>
> The patch is re-created against the trunk and re-tested (on Windows)
> and included below.
>

Oops. Sorry I attached the whole script and not the patch.
Here is the patch.

Index: tools/backup/hot-backup.py.in
===================================================================
--- tools/backup/hot-backup.py.in (revision 33592)
+++ tools/backup/hot-backup.py.in (working copy)
@@ -301,7 +301,7 @@
       def add_to_zip(baton, dirname, names):
         zp = baton[0]
         root = os.path.join(baton[1], '')
-
+ zp.writestr(zipfile.ZipInfo(dirname[len(root):]+"/"),"")
         for file in names:
           path = os.path.join(dirname, file)
           if os.path.isfile(path):

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-10 18:32:54 CEST

This is an archived mail posted to the Subversion Dev mailing list.