← Back to team overview

duplicity-team team mailing list archive

[Merge] lp:~michal-s/duplicity/duplicity into lp:duplicity

 

Michal Smereczynski has proposed merging lp:~michal-s/duplicity/duplicity into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~michal-s/duplicity/duplicity/+merge/275885

Due to changes in Microsoft Azure Python SDK the names and origin of two classes has changed and duplicity is not usable with Azure backend. The first one is WindowsAzureMissingResourceError and the second one is WindowsAzureConflictError. Both changes described here: https://github.com/Azure/azure-sdk-for-python/blob/bc1e1e767465ae365a59470058cd2913e3e6cb8f/ChangeLog.txt
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~michal-s/duplicity/duplicity into lp:duplicity.
=== modified file 'duplicity/backends/azurebackend.py'
--- duplicity/backends/azurebackend.py	2015-01-14 09:40:10 +0000
+++ duplicity/backends/azurebackend.py	2015-10-27 16:34:59 +0000
@@ -49,13 +49,13 @@
 
         account_name = os.environ['AZURE_ACCOUNT_NAME']
         account_key = os.environ['AZURE_ACCOUNT_KEY']
-        self.WindowsAzureMissingResourceError = azure.WindowsAzureMissingResourceError
+        self.WindowsAzureMissingResourceError = azure.common.AzureMissingResourceHttpError
         self.blob_service = BlobService(account_name=account_name, account_key=account_key)
         # TODO: validate container name
         self.container = parsed_url.path.lstrip('/')
         try:
             self.blob_service.create_container(self.container, fail_on_exist=True)
-        except azure.WindowsAzureConflictError:
+        except azure.common.AzureConflictHttpError:
             # Indicates that the resource could not be created because it already exists.
             pass
         except Exception as e:


Follow ups