From e1657f962eba2f459acbc831c7e58a6233290633 Mon Sep 17 00:00:00 2001
From: jgoerzen <jgoerzen>
Date: Sat, 17 Aug 2002 02:01:12 +0100
Subject: [PATCH] /offlineimap/head: changeset 235

- Changed indentation in debian/control. Closes: #156327.

- Removed calls to folder object deletions. None have been implemented
  anyway.

- folder/Maildir.py: unlink throws OSError, not IOError; fixed. Now
  handles message deleting race condition properly. Closes: #154497.
---
 offlineimap/head/debian/changelog             | 11 +++++++
 offlineimap/head/debian/control               | 30 +++++++++----------
 .../head/offlineimap/folder/Maildir.py        |  2 +-
 .../head/offlineimap/repository/Base.py       |  7 +++--
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index ef21150..88f135a 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,3 +1,14 @@
+offlineimap (3.2.6) unstable; urgency=low
+
+  * Changed indentation in debian/control.  Closes: #156327.
+  * Removed calls to folder object deletions.  None have been implemented
+    anyway.
+  * folder/Maildir.py: unlink throws OSError, not IOError; fixed.
+    Now handles message deleting race condition properly.
+    Closes: #154497.
+
+ -- John Goerzen <jgoerzen@complete.org>  Fri, 16 Aug 2002 17:43:19 -0500
+
 offlineimap (3.2.5) unstable; urgency=low
 
   * Now handles uploading messages without Message-Id headers.
diff --git a/offlineimap/head/debian/control b/offlineimap/head/debian/control
index 402915b..22a0e69 100644
--- a/offlineimap/head/debian/control
+++ b/offlineimap/head/debian/control
@@ -13,27 +13,27 @@ Description: IMAP/Maildir synchronization and reader support
  OfflineIMAP is a tool to simplify your e-mail reading.  With
  OfflimeIMAP, you can:
  .
- * Read the same mailbox from multiple computers, and have your
-   changes (deletions, etc.) be automatically reflected on
-   all computers
+  * Read the same mailbox from multiple computers, and have your
+    changes (deletions, etc.) be automatically reflected on
+    all computers
  .
- * Use various mail clients to read a single mail box
+  * Use various mail clients to read a single mail box
  .
- * Read mail while offline (on a laptop) and have all changes
-   synchronized when you get connected again
+  * Read mail while offline (on a laptop) and have all changes
+    synchronized when you get connected again
  .
- * Read IMAP mail with mail readers that do not support IMAP
+  * Read IMAP mail with mail readers that do not support IMAP
  .
- * Use SSL (secure connections) to read IMAP mail even if your reader
-   doesn't support SSL
+  * Use SSL (secure connections) to read IMAP mail even if your reader
+    doesn't support SSL
  .
- * Synchronize your mail using a completely safe and fault-tolerant
-   algorithm.  (At least I think it is!)
+  * Synchronize your mail using a completely safe and fault-tolerant
+    algorithm.  (At least I think it is!)
  .
- * Customize which mailboxes to synchronize with regular expressions
-   or lists.
+  * Customize which mailboxes to synchronize with regular expressions
+    or lists.
  .
- * Synchronize your mail two to four times faster than with other tools
-   or other mail readers' internal IMAP support.
+  * Synchronize your mail two to four times faster than with other tools
+    or other mail readers' internal IMAP support.
  .
  In short, OfflineIMAP is a tool to let you read mail how YOU want to.
diff --git a/offlineimap/head/offlineimap/folder/Maildir.py b/offlineimap/head/offlineimap/folder/Maildir.py
index 2fd0353..70d4df4 100644
--- a/offlineimap/head/offlineimap/folder/Maildir.py
+++ b/offlineimap/head/offlineimap/folder/Maildir.py
@@ -211,7 +211,7 @@ class MaildirFolder(BaseFolder):
         filename = self.messagelist[uid]['filename']
         try:
             os.unlink(filename)
-        except IOError:
+        except OSError:
             # Can't find the file -- maybe already deleted?
             newmsglist = self._scanfolder()
             if uid in newmsglist:       # Nope, try new filename.
diff --git a/offlineimap/head/offlineimap/repository/Base.py b/offlineimap/head/offlineimap/repository/Base.py
index 4c91157..5a46042 100644
--- a/offlineimap/head/offlineimap/repository/Base.py
+++ b/offlineimap/head/offlineimap/repository/Base.py
@@ -62,8 +62,9 @@ class BaseRepository:
         #
         # Find deleted folders.
         #
+        # We don't delete folders right now.
 
-        for key in desthash.keys():
-            if not key in srchash:
-                dest.deletefolder(key)
+        #for key in desthash.keys():
+        #    if not key in srchash:
+        #        dest.deletefolder(key)