浏览代码

transfer: fix archive timestamps to have +00:00

Thomas Waldmann 3 年之前
父节点
当前提交
29db66c8bc
共有 1 个文件被更改,包括 5 次插入10 次删除
  1. 5 10
      src/borg/upgrade.py

+ 5 - 10
src/borg/upgrade.py

@@ -130,16 +130,11 @@ class UpgraderFrom12To20:
         new_metadata = {}
         new_metadata = {}
         # keep all metadata except archive version and stats. also do not keep
         # keep all metadata except archive version and stats. also do not keep
         # recreate_source_id, recreate_args, recreate_partial_chunks which were used only in 1.1.0b1 .. b2.
         # recreate_source_id, recreate_args, recreate_partial_chunks which were used only in 1.1.0b1 .. b2.
-        for attr in (
-            "cmdline",
-            "hostname",
-            "username",
-            "time",
-            "time_end",
-            "comment",
-            "chunker_params",
-            "recreate_cmdline",
-        ):
+        for attr in ("cmdline", "hostname", "username", "comment", "chunker_params", "recreate_cmdline"):
             if hasattr(metadata, attr):
             if hasattr(metadata, attr):
                 new_metadata[attr] = getattr(metadata, attr)
                 new_metadata[attr] = getattr(metadata, attr)
+        # old borg used UTC timestamps, but did not have the explicit tz offset in them.
+        for attr in ("time", "time_end"):
+            if hasattr(metadata, attr):
+                new_metadata[attr] = getattr(metadata, attr) + "+00:00"
         return new_metadata
         return new_metadata