Преглед изворни кода

Merge pull request #311 from ThomasWaldmann/fixme-argv

implement cmdline metadata value decoding
anarcat пре 9 година
родитељ
комит
a395054bc5
1 измењених фајлова са 2 додато и 1 уклоњено
  1. 2 1
      borg/archive.py

+ 2 - 1
borg/archive.py

@@ -820,7 +820,8 @@ class ArchiveChecker:
             archive = StableDict(msgpack.unpackb(data))
             archive = StableDict(msgpack.unpackb(data))
             if archive[b'version'] != 1:
             if archive[b'version'] != 1:
                 raise Exception('Unknown archive metadata version')
                 raise Exception('Unknown archive metadata version')
-            decode_dict(archive, (b'name', b'hostname', b'username', b'time'))  # fixme: argv
+            decode_dict(archive, (b'name', b'hostname', b'username', b'time'))
+            archive[b'cmdline'] = [arg.decode('utf-8', 'surrogateescape') for arg in archive[b'cmdline']]
             items_buffer = ChunkBuffer(self.key)
             items_buffer = ChunkBuffer(self.key)
             items_buffer.write_chunk = add_callback
             items_buffer.write_chunk = add_callback
             for item in robust_iterator(archive):
             for item in robust_iterator(archive):