Merge lp:~mterry/duplicity/1031277 into lp:duplicity/0.6-series

Proposed by Michael Terry on 2012-09-19
Status: Merged
Merged at revision: 865
Proposed branch: lp:~mterry/duplicity/1031277
Merge into: lp:duplicity/0.6-series
Diff against target: 24 lines (+4/-4)
1 file modified
duplicity/backends/_ssh_paramiko.py (+4/-4)
To merge this branch: bzr merge lp:~mterry/duplicity/1031277
Reviewer Review Type Date Requested Status
duplicity-team 2012-09-19 Pending
Review via email: mp+125096@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/backends/_ssh_paramiko.py'
2--- duplicity/backends/_ssh_paramiko.py 2012-05-16 11:03:20 +0000
3+++ duplicity/backends/_ssh_paramiko.py 2012-09-19 05:00:24 +0000
4@@ -360,16 +360,16 @@
5 for fn in filename_list:
6 if (globals.use_scp):
7 self.runremote("rm '%s/%s'" % (self.remote_dir,fn),False,"scp rm ")
8- return
9 else:
10 try:
11 self.sftp.remove(fn)
12- return
13 except Exception, e:
14 raise BackendException("sftp rm %s failed: %s" % (fn,e))
15 except Exception, e:
16- log.Warn("%s (Try %d of %d) Will retry in %d seconds." % (e,n,globals.num_retries,self.retry_delay))
17- raise BackendException("Giving up trying to delete '%s' after %d attempts" % (", ".join(filename_list),n))
18+ if n == globals.num_retries:
19+ log.FatalError(str(e), log.ErrorCode.backend_error)
20+ else:
21+ log.Warn("%s (Try %d of %d) Will retry in %d seconds." % (e,n,globals.num_retries,self.retry_delay))
22
23 def runremote(self,cmd,ignoreexitcode=False,errorprefix=""):
24 """small convenience function that opens a shell channel, runs remote command and returns

Subscribers

People subscribed via source and target branches

to all changes: