Browse Source

Merge pull request #5856 from ThomasWaldmann/tar-roundtrip-master

import-tar: fix empty user/group name in TarInfo, fixes #5853
TW 4 năm trước cách đây
mục cha
commit
a9aceb5e43
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      src/borg/archive.py

+ 1 - 1
src/borg/archive.py

@@ -1410,7 +1410,7 @@ class TarfileObjectProcessors:
     @contextmanager
     @contextmanager
     def create_helper(self, tarinfo, status=None, type=None):
     def create_helper(self, tarinfo, status=None, type=None):
         item = Item(path=make_path_safe(tarinfo.name), mode=tarinfo.mode | type,
         item = Item(path=make_path_safe(tarinfo.name), mode=tarinfo.mode | type,
-                    uid=tarinfo.uid, gid=tarinfo.gid, user=tarinfo.uname, group=tarinfo.gname,
+                    uid=tarinfo.uid, gid=tarinfo.gid, user=tarinfo.uname or None, group=tarinfo.gname or None,
                     mtime=tarinfo.mtime * 1000**3)
                     mtime=tarinfo.mtime * 1000**3)
         yield item, status
         yield item, status
         # if we get here, "with"-block worked ok without error/exception, the item was processed ok...
         # if we get here, "with"-block worked ok without error/exception, the item was processed ok...