[arch-commits] Commit in offlineimap/trunk (2 files)

[Sébastien Luttringer]

    Date: Sunday, August 25, 2013 @ 21:48:20
  Author: seblu
Revision: 96337

upgpkg: offlineimap 6.5.4-3

fix issue with gmail saving chats:
http://comments.gmane.org/gmane.mail.imap.offlineimap.general/5792

Added:
  offlineimap/trunk/01-properly-detect-readonly-folders.patch
Modified:
  offlineimap/trunk/PKGBUILD

-------------------------------------------+
 01-properly-detect-readonly-folders.patch |   32 ++++++++++++++++++++++++++++
 PKGBUILD                                  |    9 +++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

Added: 01-properly-detect-readonly-folders.patch
===================================================================
--- 01-properly-detect-readonly-folders.patch	                        (rev 0)
+++ 01-properly-detect-readonly-folders.patch	2013-08-25 19:48:20 UTC (rev 96337)
@@ -0,0 +1,32 @@
+From 9ad8f76a4313b83587fc44c8c864c52f02a4692c Mon Sep 17 00:00:00 2001
+From: Eygene Ryabinkin <rea at codelabs.ru>
+Date: Sun, 5 Aug 2012 22:40:52 +0400
+Subject: [PATCH] IMAPlib mixin class: pass 'readonly' exception to our
+ callers
+
+This will allow our callers who are capable of dealing with
+readonly folders to properly detect this condition and act
+accordingly.
+
+Signed-off-by: Eygene Ryabinkin <rea at codelabs.ru>
+---
+ offlineimap/imaplibutil.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
+index aa165f0..4290b2b 100644
+--- a/offlineimap/imaplibutil.py
++++ b/offlineimap/imaplibutil.py
+@@ -49,6 +49,9 @@ class UsefulIMAPMixIn(object):
+         del self.untagged_responses[:]
+         try:
+             result = super(UsefulIMAPMixIn, self).select(mailbox, readonly)
++        except self.readonly as e:
++            # pass self.readonly to our callers
++            raise
+         except self.abort as e:
+             # self.abort is raised when we are supposed to retry
+             errstr = "Server '%s' closed connection, error on SELECT '%s'. Ser"\
+-- 
+1.7.11.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-25 19:17:48 UTC (rev 96336)
+++ PKGBUILD	2013-08-25 19:48:20 UTC (rev 96337)
@@ -6,7 +6,7 @@
 
 pkgname=offlineimap
 pkgver=6.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Synchronizes emails between two repositories'
 arch=('any')
 url='http://offlineimap.org/'
@@ -14,13 +14,16 @@
 depends=('python2')
 makedepends=('python2-docutils')
 source=("http://cloud.github.com/downloads/spaetz/offlineimap/offlineimap-v$pkgver.tar.gz"
-        '00-fix-readonly.patch')
+        '00-fix-readonly.patch'
+        '01-properly-detect-readonly-folders.patch')
 sha1sums=('a9ad5f32f8bc0ec042f8059ea9d34282bb8b682a'
-          'a9faa6d857b0d46a485f7551a3e56f44546370f8')
+          'a9faa6d857b0d46a485f7551a3e56f44546370f8'
+          'd0b9f816c05b0b3cac352fce29ca6920ef598bb2')
 
 prepare() {
     cd spaetz-offlineimap-*
     patch -p1 -i "$srcdir/00-fix-readonly.patch"
+    patch -p1 -i "$srcdir/01-properly-detect-readonly-folders.patch"
     find . -type f -exec \
         sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
     sed -i 's/\^/=/g' docs/MANUAL.rst