[arch-commits] Commit in offlineimap/repos/community-any (5 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sun Aug 25 19:48:27 UTC 2013
Date: Sunday, August 25, 2013 @ 21:48:27
Author: seblu
Revision: 96338
archrelease: copy trunk to community-any
Added:
offlineimap/repos/community-any/00-fix-readonly.patch
(from rev 96337, offlineimap/trunk/00-fix-readonly.patch)
offlineimap/repos/community-any/01-properly-detect-readonly-folders.patch
(from rev 96337, offlineimap/trunk/01-properly-detect-readonly-folders.patch)
offlineimap/repos/community-any/PKGBUILD
(from rev 96337, offlineimap/trunk/PKGBUILD)
Deleted:
offlineimap/repos/community-any/00-fix-readonly.patch
offlineimap/repos/community-any/PKGBUILD
-------------------------------------------+
00-fix-readonly.patch | 28 ++++----
01-properly-detect-readonly-folders.patch | 32 ++++++++++
PKGBUILD | 89 ++++++++++++++--------------
3 files changed, 92 insertions(+), 57 deletions(-)
Deleted: 00-fix-readonly.patch
===================================================================
--- 00-fix-readonly.patch 2013-08-25 19:48:20 UTC (rev 96337)
+++ 00-fix-readonly.patch 2013-08-25 19:48:27 UTC (rev 96338)
@@ -1,14 +0,0 @@
-# Seblu - 2013-08-21
-# http://comments.gmane.org/gmane.mail.imap.offlineimap.general/5838
-
---- a/offlineimap/repository/Base.py 2012-06-02 13:41:46.000000000 +0200
-+++ b/offlineimap/repository/Base.py 2013-08-21 14:34:44.585000000 +0200
-@@ -134,7 +134,7 @@
-
- It is disabled by either setting the whole repository
- 'readonly' or by using the 'createfolders' setting."""
-- return self._readonly or self.getconfboolean('createfolders', True)
-+ return (not self._readonly) and self.getconfboolean('createfolders', True)
-
- def makefolder(self, foldername):
- """Create a new folder"""
Copied: offlineimap/repos/community-any/00-fix-readonly.patch (from rev 96337, offlineimap/trunk/00-fix-readonly.patch)
===================================================================
--- 00-fix-readonly.patch (rev 0)
+++ 00-fix-readonly.patch 2013-08-25 19:48:27 UTC (rev 96338)
@@ -0,0 +1,14 @@
+# Seblu - 2013-08-21
+# http://comments.gmane.org/gmane.mail.imap.offlineimap.general/5838
+
+--- a/offlineimap/repository/Base.py 2012-06-02 13:41:46.000000000 +0200
++++ b/offlineimap/repository/Base.py 2013-08-21 14:34:44.585000000 +0200
+@@ -134,7 +134,7 @@
+
+ It is disabled by either setting the whole repository
+ 'readonly' or by using the 'createfolders' setting."""
+- return self._readonly or self.getconfboolean('createfolders', True)
++ return (not self._readonly) and self.getconfboolean('createfolders', True)
+
+ def makefolder(self, foldername):
+ """Create a new folder"""
Copied: offlineimap/repos/community-any/01-properly-detect-readonly-folders.patch (from rev 96337, offlineimap/trunk/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:27 UTC (rev 96338)
@@ -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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-25 19:48:20 UTC (rev 96337)
+++ PKGBUILD 2013-08-25 19:48:27 UTC (rev 96338)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo at gmail.com>
-# Contributor: mucknert <mucknert at gmx.net>
-
-pkgname=offlineimap
-pkgver=6.5.4
-pkgrel=2
-pkgdesc='Synchronizes emails between two repositories'
-arch=('any')
-url='http://offlineimap.org/'
-license=('GPL')
-depends=('python2')
-makedepends=('python2-docutils')
-source=("http://cloud.github.com/downloads/spaetz/offlineimap/offlineimap-v$pkgver.tar.gz"
- '00-fix-readonly.patch')
-sha1sums=('a9ad5f32f8bc0ec042f8059ea9d34282bb8b682a'
- 'a9faa6d857b0d46a485f7551a3e56f44546370f8')
-
-prepare() {
- cd spaetz-offlineimap-*
- patch -p1 -i "$srcdir/00-fix-readonly.patch"
- find . -type f -exec \
- sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
- sed -i 's/\^/=/g' docs/MANUAL.rst
-}
-
-build() {
- cd spaetz-offlineimap-*
- python2 setup.py build
- rst2man2 docs/MANUAL.rst offlineimap.1
-}
-
-package() {
- cd spaetz-offlineimap-*
- python2 setup.py install --root="$pkgdir" --optimize=1
- install -Dm644 offlineimap.1 "$pkgdir"/usr/share/man/man1/offlineimap.1
- install -Dm644 offlineimap.conf "$pkgdir"/usr/share/offlineimap/offlineimap.conf
- install -Dm644 offlineimap.conf.minimal "$pkgdir"/usr/share/offlineimap/offlineimap.conf.minimal
-}
-
-# vim:set ts=4 sw=4 et:
Copied: offlineimap/repos/community-any/PKGBUILD (from rev 96337, offlineimap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-08-25 19:48:27 UTC (rev 96338)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Callan Barrett <wizzomafizzo at gmail.com>
+# Contributor: mucknert <mucknert at gmx.net>
+
+pkgname=offlineimap
+pkgver=6.5.4
+pkgrel=3
+pkgdesc='Synchronizes emails between two repositories'
+arch=('any')
+url='http://offlineimap.org/'
+license=('GPL')
+depends=('python2')
+makedepends=('python2-docutils')
+source=("http://cloud.github.com/downloads/spaetz/offlineimap/offlineimap-v$pkgver.tar.gz"
+ '00-fix-readonly.patch'
+ '01-properly-detect-readonly-folders.patch')
+sha1sums=('a9ad5f32f8bc0ec042f8059ea9d34282bb8b682a'
+ '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
+}
+
+build() {
+ cd spaetz-offlineimap-*
+ python2 setup.py build
+ rst2man2 docs/MANUAL.rst offlineimap.1
+}
+
+package() {
+ cd spaetz-offlineimap-*
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -Dm644 offlineimap.1 "$pkgdir"/usr/share/man/man1/offlineimap.1
+ install -Dm644 offlineimap.conf "$pkgdir"/usr/share/offlineimap/offlineimap.conf
+ install -Dm644 offlineimap.conf.minimal "$pkgdir"/usr/share/offlineimap/offlineimap.conf.minimal
+}
+
+# vim:set ts=4 sw=4 et:
More information about the arch-commits
mailing list