duplicity-team team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/u1-402 into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)
Related bugs:
  Bug #997691 in Duplicity: "Ubuntu One backend should check for 402 error for out-of-space messages"
  https://bugs.launchpad.net/duplicity/+bug/997691

For more details, see:
https://code.launchpad.net/~mterry/duplicity/u1-402/+merge/131447

Switch the code we check for out-of-space in u1backend.
-- 
https://code.launchpad.net/~mterry/duplicity/u1-402/+merge/131447
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/u1-402 into lp:duplicity.

=== modified file 'duplicity/backends/u1backend.py'
--- duplicity/backends/u1backend.py	2012-10-17 11:45:25 +0000
+++ duplicity/backends/u1backend.py	2012-10-25 16:21:19 +0000
@@ -91,10 +91,10 @@
                 return resp, content
 
             ecode = log.ErrorCode.backend_error
-            if numcode == 404:
+            if numcode == 402:  # Payment Required
+                ecode = log.ErrorCode.backend_no_space
+            elif numcode == 404:
                 ecode = log.ErrorCode.backend_not_found
-            elif numcode == 507:  # webdav no space
-                ecode = log.ErrorCode.backend_no_space
 
             if n >= globals.num_retries + 1:
                 log.FatalError("Giving up on request after %d attempts, last status %d %s" % (n, numcode.resp.reason), ecode)