diff -u duplicity-0.6.09/debian/changelog duplicity-0.6.09/debian/changelog --- duplicity-0.6.09/debian/changelog +++ duplicity-0.6.09/debian/changelog @@ -1,3 +1,10 @@ +duplicity (0.6.09-0ubuntu2) maverick; urgency=low + + * debian/patches/04fixparsed_url.dpatch: upstream fix for make + parsed_url part of the instance. Thanks Liraz Siri (LP: #612714) + + -- Angel Abad Thu, 12 Aug 2010 10:40:08 +0200 + duplicity (0.6.09-0ubuntu1) maverick; urgency=low * New upstream release diff -u duplicity-0.6.09/debian/patches/00list duplicity-0.6.09/debian/patches/00list --- duplicity-0.6.09/debian/patches/00list +++ duplicity-0.6.09/debian/patches/00list @@ -4,0 +5 @@ +04fixparsed_url.dpatch only in patch2: unchanged: --- duplicity-0.6.09.orig/debian/patches/04fixparsed_url.dpatch +++ duplicity-0.6.09/debian/patches/04fixparsed_url.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04fixparsed_url.dpatch by Liraz Siri +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: bugfix: make parsed_url part of the instance + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' duplicity-0.6.09~/src/backends/botobackend.py duplicity-0.6.09/src/backends/botobackend.py +--- duplicity-0.6.09~/src/backends/botobackend.py 2010-07-25 18:14:39.000000000 +0200 ++++ duplicity-0.6.09/src/backends/botobackend.py 2010-08-12 10:36:22.000000000 +0200 +@@ -66,6 +66,7 @@ + self.key_prefix = '' + + self.straight_url = duplicity.backend.strip_auth_from_url(parsed_url) ++ self.parsed_url = parsed_url + self.resetConnection() + + def resetConnection(self): +@@ -135,7 +136,7 @@ + self.conn = S3Connection() + else: + assert self.scheme == 's3' +- self.conn = S3Connection(host=parsed_url.hostname) ++ self.conn = S3Connection(host=self.parsed_url.hostname) + + if hasattr(self.conn, 'calling_format'): + if calling_format is None: