Attachment 883116 Details for Bug 1084675 – duplicity upgrade to 0.6.23

[patch] duplicity upgrade to 0.6.23

duplicity-upgrade-to-0.6.23.patch (text/plain), 3.26 KB, created by poma on 2014-04-06 02:21:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-04-06 02:21:14 UTC

Size: 3.26 KB

patch

obsolete

>diff --git a/duplicity-0.6.22-s3-bucket-root.patch b/duplicity-0.6.22-s3-bucket-root.patch
>deleted file mode 100644
>index cda2f68..0000000
>--- a/duplicity-0.6.22-s3-bucket-root.patch
>+++ /dev/null
>@@ -1,32 +0,0 @@
>---- duplicity-0.6.22/duplicity/backends/_boto_single.py	2013-07-19 22:38:23 +0000
>-+++ duplicity-0.6.22/duplicity/backends/_boto_single.py	2013-09-03 23:12:16 +0000
>-@@ -202,8 +202,7 @@ 
>- 
>-         if not remote_filename:
>-             remote_filename = source_path.get_filename()
>--        key = self.storage_uri.new_key()
>--        key.key = self.key_prefix + remote_filename
>-+        key = self.bucket.new_key(self.key_prefix + remote_filename)
>- 
>-         for n in range(1, globals.num_retries+1):
>-             if n > 1:
>-@@ -239,14 +238,16 @@ 
>-         raise BackendException("Error uploading %s/%s" % (self.straight_url, remote_filename))
>- 
>-     def get(self, remote_filename, local_path):
>--        key = self.storage_uri.new_key()
>--        key.key = self.key_prefix + remote_filename
>-         for n in range(1, globals.num_retries+1):
>-             if n > 1:
>-                 # sleep before retry (new connection to a **hopeful** new host, so no need to wait so long)
>-                 time.sleep(10)
>-             log.Info("Downloading %s/%s" % (self.straight_url, remote_filename))
>-             try:
>-+                key_name = self.key_prefix + remote_filename
>-+                key = self.bucket.get_key(key_name)
>-+                if key is None:
>-+                    raise BackendException("%s: key not found" % key_name)
>-                 key.get_contents_to_filename(local_path.name)
>-                 local_path.setdata()
>-                 self.resetConnection()
>-
>diff --git a/duplicity.spec b/duplicity.spec
>index 6e8e729..803fdf7 100644
>--- a/duplicity.spec
>+++ b/duplicity.spec
>@@ -2,17 +2,16 @@
> 
> Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
> Name:           duplicity
>-Version:        0.6.22
>-Release:        5%{?dist}
>+Version:        0.6.23
>+Release:        1%{?dist}
> License:        GPLv2+
> Group:          Applications/Archiving
> URL:            http://www.nongnu.org/duplicity/
> Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
> Patch0:         duplicity-0.6.22-documentation.patch
>-Patch1:         duplicity-0.6.22-s3-bucket-root.patch
> Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
> Requires:       openssh-clients, ncftp >= 3.1.9, rsync, python-boto >= 0.9d
>-Requires:       python-paramiko python-dropbox
>+Requires:       python-paramiko python-dropbox python-lockfile
> 
> %if 0%{?rhel}  != 5
> Requires:      ca-certificates
>@@ -37,7 +36,6 @@ but not hard links.
> %prep
> %setup -q
> %patch0 -p1 -b .documentation
>-%patch1 -p1 -b .s3-bucket-root
> 
> %build
> %{__python} setup.py build
>@@ -66,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_sysconfdir}/%{name}/cacert.pem
> 
> %changelog
>+* Sun Apr 06 2014 poma <poma@gmail.com> - 0.6.23-1
>+- Upgrade to 0.6.23
>+
> * Fri Jan 17 2014 Rahul Sundaram <sundaram@fedoraproject.org> - 0.6.22-5
> - Added patch to fix Amazon s3 backup (#1048068)
> 
>diff --git a/sources b/sources
>index 2fb5a7c..f5d03bd 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-5b035359a6bb7b2f3f3b9829c6c071e1  duplicity-0.6.22.tar.gz
>+ae0e84446bcf114735de1057ed53c977  duplicity-0.6.23.tar.gz

Actions: View | Diff

Attachments on bug 1084675: 883116