[arch-commits] Commit in duplicity/trunk (PKGBUILD u1backend.patch)

[Lukas Fleischer]

    Date: Tuesday, June 18, 2013 @ 11:01:00
  Author: lfleischer
Revision: 92893

upgpkg: duplicity 0.6.21-3

Fix backup to Ubuntu One (FS#35487).

Added:
  duplicity/trunk/u1backend.patch
Modified:
  duplicity/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   15 ++++++++++++---
 u1backend.patch |   16 ++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-18 08:51:42 UTC (rev 92892)
+++ PKGBUILD	2013-06-18 09:01:00 UTC (rev 92893)
@@ -4,7 +4,7 @@
 
 pkgname=duplicity
 pkgver=0.6.21
-pkgrel=2
+pkgrel=3
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
@@ -18,10 +18,19 @@
             'python2-httplib2: Ubuntu One backend'
             'python2-oauthlib: Ubuntu One backend'
             'rsync: rsync backend')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "u1backend.patch")
 md5sums=('4ade1de475e0af64211bb6933b593057'
-         '3521d679ba7dff46653313aa3b3e6855')
+         '3521d679ba7dff46653313aa3b3e6855'
+         'b7aede10a3f5503ae4428a506b57486c')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix Ubuntu One backup (FS#35487, upstream revisions 912 and 913, will be fixed in 0.6.22).
+  patch -p0 duplicity/backends/u1backend.py ../u1backend.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: u1backend.patch
===================================================================
--- u1backend.patch	                        (rev 0)
+++ u1backend.patch	2013-06-18 09:01:00 UTC (rev 92893)
@@ -0,0 +1,16 @@
+86a87,90
+> 
+>                 if isinstance(body, file):
+>                     body.seek(0) # Go to the beginning of the file for the retry
+> 
+108a113,115
+>             if isinstance(body, file):
+>                 body.seek(0) # Go to the beginning of the file for the retry
+> 
+209a217
+>         size = os.path.getsize(source_path.name)
+213c221,222
+<         headers = {"Content-Type": content_type}
+---
+>         headers = {"Content-Length": str(size),
+>                    "Content-Type": content_type}