Attachment 851671 Details for Bug 1048068 – duplicity s3 patch

[patch] duplicity s3 patch

928_926.diff (text/plain), 1.45 KB, created by Michael Wagner on 2014-01-17 15:14:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Wagner

Created: 2014-01-17 15:14:06 UTC

Size: 1.45 KB

patch

obsolete

>=== modified file 'duplicity/backends/_boto_single.py'
>--- duplicity/backends/_boto_single.py	2013-07-19 22:38:23 +0000
>+++ 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()
>

Actions: View | Diff

Attachments on bug 1048068: 844831 | 851671