Просмотр исходного кода

Merge pull request #3132 from ThomasWaldmann/no-time-end-1.1

recreate: don't crash on attic archives w/o time_end, fixes #3109
TW 7 лет назад
Родитель
Сommit
9e83632c06
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/borg/archive.py

+ 1 - 1
src/borg/archive.py

@@ -1697,7 +1697,7 @@ class ArchiveRecreater:
         target.save(comment=comment, additional_metadata={
         target.save(comment=comment, additional_metadata={
             # keep some metadata as in original archive:
             # keep some metadata as in original archive:
             'time': archive.metadata.time,
             'time': archive.metadata.time,
-            'time_end': archive.metadata.time_end,
+            'time_end': archive.metadata.get('time_end') or archive.metadata.time,
             'cmdline': archive.metadata.cmdline,
             'cmdline': archive.metadata.cmdline,
             # but also remember recreate metadata:
             # but also remember recreate metadata:
             'recreate_cmdline': sys.argv,
             'recreate_cmdline': sys.argv,