mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

paperkey.html - decode as utf-8, fixes #2150 

hardcoded the encoding for reading it. while utf-8 is the default
encoding on many systems, it does not work everywhere.

and when it tries to decode with the ascii decoder, it fails.
This commit is contained in:
Thomas Waldmann 2017-02-13 04:12:12 +01:00 committed by Marian Beermann
parent 11318c94dc
commit 8d432b01e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/borg/testsuite/archiver.py
View File

@ -1979,7 +1979,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
repo_id = self._extract_repository_id(self.repository_path) repo_id = self._extract_repository_id(self.repository_path)
self.cmd('key', 'export', '--qr-html', self.repository_location, export_file) self.cmd('key', 'export', '--qr-html', self.repository_location, export_file)
with open(export_file, 'r') as fd: with open(export_file, 'r', encoding='utf-8') as fd:
export_contents = fd.read() export_contents = fd.read()
assert bin_to_hex(repo_id) in export_contents assert bin_to_hex(repo_id) in export_contents