Date: Friday, October 4, 2013 @ 16:54:40 Author: bisson Revision: 98043
upstream update Modified: offlineimap/trunk/PKGBUILD Deleted: offlineimap/trunk/00-fix-readonly.patch offlineimap/trunk/01-properly-detect-readonly-folders.patch -------------------------------------------+ 00-fix-readonly.patch | 14 ------------ 01-properly-detect-readonly-folders.patch | 32 ---------------------------- PKGBUILD | 24 +++++++-------------- 3 files changed, 9 insertions(+), 61 deletions(-) Deleted: 00-fix-readonly.patch =================================================================== --- 00-fix-readonly.patch 2013-10-04 14:44:26 UTC (rev 98042) +++ 00-fix-readonly.patch 2013-10-04 14:54:40 UTC (rev 98043) @@ -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""" Deleted: 01-properly-detect-readonly-folders.patch =================================================================== --- 01-properly-detect-readonly-folders.patch 2013-10-04 14:44:26 UTC (rev 98042) +++ 01-properly-detect-readonly-folders.patch 2013-10-04 14:54:40 UTC (rev 98043) @@ -1,32 +0,0 @@ -From 9ad8f76a4313b83587fc44c8c864c52f02a4692c Mon Sep 17 00:00:00 2001 -From: Eygene Ryabinkin <[email protected]> -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 <[email protected]> ---- - 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-10-04 14:44:26 UTC (rev 98042) +++ PKGBUILD 2013-10-04 14:54:40 UTC (rev 98043) @@ -5,8 +5,8 @@ # Contributor: mucknert <[email protected]> pkgname=offlineimap -pkgver=6.5.4 -pkgrel=3 +pkgver=6.5.5 +pkgrel=1 pkgdesc='Synchronizes emails between two repositories' arch=('any') url='http://offlineimap.org/' @@ -13,30 +13,24 @@ 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') +source=("https://github.com/OfflineIMAP/offlineimap/archive/v${pkgver}.tar.gz";) +sha1sums=('8cf4b1dfe98f14d51d8e331dd7393accc9320ac7') prepare() { - cd "${srcdir}"/spaetz-offlineimap-* - patch -p1 -i ../00-fix-readonly.patch - patch -p1 -i ../01-properly-detect-readonly-folders.patch + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/\^/=/g' -i docs/MANUAL.rst find . -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; - sed -i 's/\^/=/g' docs/MANUAL.rst + sed '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' -i {} \; } build() { - cd "${srcdir}"/spaetz-offlineimap-* + cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py build rst2man2 docs/MANUAL.rst offlineimap.1 } package() { - cd "${srcdir}"/spaetz-offlineimap-* + cd "${srcdir}/${pkgname}-${pkgver}" 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
