← Back to team overview

duplicity-team team mailing list archive

[Merge] lp:~jon-haggblad/duplicity/ftps-fix into lp:duplicity

 

Jon Haggblad has proposed merging lp:~jon-haggblad/duplicity/ftps-fix into lp:duplicity.

Commit message:
Minor bugfix for the ftps backend where lftp needs the host prefixed by "ftps://".

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~jon-haggblad/duplicity/ftps-fix/+merge/218877

Minor bugfix for the ftps backend where lftp needs the host prefixed by "ftps://".
-- 
https://code.launchpad.net/~jon-haggblad/duplicity/ftps-fix/+merge/218877
Your team duplicity-team is requested to review the proposed merge of lp:~jon-haggblad/duplicity/ftps-fix into lp:duplicity.
=== modified file 'duplicity/backends/ftpsbackend.py'
--- duplicity/backends/ftpsbackend.py	2014-05-07 12:51:00 +0000
+++ duplicity/backends/ftpsbackend.py	2014-05-08 20:10:32 +0000
@@ -79,7 +79,7 @@
         os.write(self.tempfile, "set net:timeout %s\n" % globals.timeout)
         os.write(self.tempfile, "set net:max-retries %s\n" % globals.num_retries)
         os.write(self.tempfile, "set ftp:passive-mode %s\n" % self.conn_opt)
-        os.write(self.tempfile, "open %s %s\n" % (self.portflag, self.parsed_url.hostname))
+        os.write(self.tempfile, "open %s ftps://%s\n" % (self.portflag, self.parsed_url.hostname))
         # allow .netrc auth by only setting user/pass when user was actually given
         if self.parsed_url.username:
             os.write(self.tempfile, "user %s %s\n" % (self.parsed_url.username, self.password))


Follow ups