Attachment 594593 Details for Bug 835688 – Dodji's patch for problem with empty folder names

[patch] Dodji's patch for problem with empty folder names

offlineimap-new.patch (text/plain), 1.81 KB, created by Jes Sorensen on 2012-06-26 20:28:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jes Sorensen

Created: 2012-06-26 20:28:39 UTC

Size: 1.81 KB

patch

obsolete

>From e19aea495632680410da15d465b2cbc54c1f5199 Mon Sep 17 00:00:00 2001
>From: Dodji Seketeli <dodji@seketeli.org>
>Date: Tue, 26 Jun 2012 12:24:41 +0200
>Subject: [PATCH] Avoid trying to synchronize folders that have empty names
>
>Scanning the list of Maildir sub-directories can yield directories
>with empty names.  If the path separator is '/', it can result in
>offlineimap trying to (wrongly) create a directory named '/' on the
>remote server, and some server really dislike that.
>
>This patch ensures that MaildirRepository._getfolders_scandir never
>returs a directory with an empty name.
>---
> offlineimap/repository/Maildir.py |   11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/offlineimap/repository/Maildir.py b/offlineimap/repository/Maildir.py
>index f197002..4fdd2e7 100644
>--- a/offlineimap/repository/Maildir.py
>+++ b/offlineimap/repository/Maildir.py
>@@ -152,8 +152,15 @@ class MaildirRepository(BaseRepository):
>         # Iterate over directories in top & top itself.
>         for dirname in os.listdir(toppath) + ['']:
>             self.debug("  dirname = %s" % dirname)
>-            if dirname == '' and extension is not None:
>-                self.debug('  skip this entry (already scanned)')
>+            if dirname == '':
>+                if extension is not None:
>+                    # We are skipping this because it has already be
>+                    # scanned
>+                    self.debug('  skip this entry (already scanned)')
>+                else:
>+                    # We are skipping this because a directory with an
>+                    # empty path name does not make sense
>+                    self.debug('  skip this entry (None)')
>                 continue
>             if dirname in ['cur', 'new', 'tmp']:
>                 self.debug("  skip this entry (Maildir special)")
>-- 
>1.7.10.2

Actions: View | Diff

Attachments on bug 835688: 594593