Pārlūkot izejas kodu

Merge pull request #3129 from ThomasWaldmann/fallback-no-truncate-1.1

don't crash in first part of truncate_and_unlink, fixes #3117
TW 7 gadi atpakaļ
vecāks
revīzija
8ca6dc03d2
1 mainītis faili ar 8 papildinājumiem un 2 dzēšanām
  1. 8 2
      src/borg/helpers.py

+ 8 - 2
src/borg/helpers.py

@@ -2,6 +2,7 @@ import argparse
 import contextlib
 import contextlib
 import collections
 import collections
 import enum
 import enum
+import errno
 import grp
 import grp
 import hashlib
 import hashlib
 import logging
 import logging
@@ -2283,8 +2284,13 @@ def truncate_and_unlink(path):
     recover. Refer to the "File system interaction" section
     recover. Refer to the "File system interaction" section
     in repository.py for further explanations.
     in repository.py for further explanations.
     """
     """
-    with open(path, 'r+b') as fd:
-        fd.truncate()
+    try:
+        with open(path, 'r+b') as fd:
+            fd.truncate()
+    except OSError as err:
+        if err.errno != errno.ENOTSUP:
+            raise
+        # don't crash if the above ops are not supported.
     os.unlink(path)
     os.unlink(path)