[pull] master from borgbackup:master

setup.py

@@ -236,7 +236,10 @@ def members_appended(*ds):
             # compile .pyx extensions to .c in parallel, does not work on windows
             cython_opts['nthreads'] = cpu_threads + 1
 
-        cythonize([posix_ext, linux_ext, freebsd_ext, darwin_ext, windows_ext], **cython_opts)
+        # generate C code from Cython for ALL supported platforms, so we have them in the sdist.
+        # the sdist does not require Cython at install time, so we need all as C.
+        cythonize([posix_ext, linux_ext, syncfilerange_ext, freebsd_ext, darwin_ext, windows_ext], **cython_opts)
+        # generate C code from Cython for THIS platform (and for all platform-independent Cython parts).
         ext_modules = cythonize(ext_modules, **cython_opts)
 
 

src/borg/repository.py

@@ -894,10 +894,19 @@ def _update_index(self, segment, objects, report=None):
 
     def _rebuild_sparse(self, segment):
         """Rebuild sparse bytes count for a single segment relative to the current index."""
-        self.compact[segment] = 0
+        try:
+            segment_size = self.io.segment_size(segment)
+        except FileNotFoundError:
+            # segment does not exist any more, remove it from the mappings
+            # note: no need to self.compact.pop(segment), as we start from empty mapping.
+            self.segments.pop(segment)
+            return
+
         if self.segments[segment] == 0:
-            self.compact[segment] += self.io.segment_size(segment)
+            self.compact[segment] = segment_size
             return
+
+        self.compact[segment] = 0
         for tag, key, offset, size in self.io.iter_objects(segment, read_data=False):
             if tag == TAG_PUT:
                 if self.index.get(key, (-1, -1)) != (segment, offset):