duplicity-team team mailing list archive

[Adam Jacobs <alj@xxxxxxxxxxxx>]

Adam Jacobs has proposed merging lp:~bllfr0g/duplicity/duplicity into lp:duplicity.

Commit message:
fixes bug #1847885

Requested reviews:
  Kenneth Loafman (kenneth-loafman)

For more details, see:
https://code.launchpad.net/~bllfr0g/duplicity/duplicity/+merge/374053
-- 
Your team duplicity-team is subscribed to branch lp:duplicity.

=== modified file 'duplicity/backends/b2backend.py'
--- duplicity/backends/b2backend.py	2019-10-05 15:55:30 +0000
+++ duplicity/backends/b2backend.py	2019-10-13 00:07:27 +0000
@@ -135,16 +135,16 @@
         u"""
         Delete filename from remote server
         """
-        log.Log(u"Delete: %s" % self.path + filename, log.INFO)
-        file_version_info = self.file_info(quote_plus(self.path + filename))
+        log.Log(u"Delete: %s" % self.path + util.fsdecode(filename), log.INFO)
+        file_version_info = self.file_info(quote_plus(self.path + util.fsdecode(filename)))
         self.bucket.delete_file_version(file_version_info.id_, file_version_info.file_name)
 
     def _query(self, filename):
         u"""
         Get size info of filename
         """
-        log.Log(u"Query: %s" % self.path + filename, log.INFO)
-        file_version_info = self.file_info(quote_plus(self.path + filename))
+        log.Log(u"Query: %s" % self.path + util.fsdecode(filename), log.INFO)
+        file_version_info = self.file_info(quote_plus(self.path + util.fsdecode(filename)))
         return {u'size': file_version_info.size
                 if file_version_info is not None and file_version_info.size is not None else -1}