浏览代码

get_item_data: do not require item.uid/gid, see #7249

if uid is not present, use None.
if gid is not present, use None.
Thomas Waldmann 2 年之前
父节点
当前提交
262812e76f
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/borg/helpers/parseformat.py

+ 4 - 4
src/borg/helpers/parseformat.py

@@ -893,10 +893,10 @@ class ItemFormatter(BaseFormatter):
         item_data["type"] = item_type
         item_data["mode"] = mode
 
-        item_data.update(text_to_json("user", item.get("user", str(item.uid))))
-        item_data.update(text_to_json("group", item.get("group", str(item.gid))))
-        item_data["uid"] = item.uid
-        item_data["gid"] = item.gid
+        item_data["uid"] = item.get("uid")  # int or None
+        item_data["gid"] = item.get("gid")  # int or None
+        item_data.update(text_to_json("user", item.get("user", str(item_data["uid"]))))
+        item_data.update(text_to_json("group", item.get("group", str(item_data["gid"]))))
 
         if self.json_lines:
             item_data["healthy"] = "chunks_healthy" not in item