浏览代码

Revert "in --read-special mode, follow symlinks, fixes #1215"

This reverts commit c3073bacbb4850cf3a526ac08db42b05f3e33684.

Needs to be solved differently, see following changesets.
Thomas Waldmann 9 年之前
父节点
当前提交
7c8783e7c2
共有 1 个文件被更改,包括 1 次插入9 次删除
  1. 1 9
      borg/archiver.py

+ 1 - 9
borg/archiver.py

@@ -256,15 +256,7 @@ class Archiver:
             return
 
         try:
-            # usually, do not follow symlinks (if we have a symlink, we want to
-            # backup it as such).
-            # but if we are in --read-special mode, we later process <path> as
-            # a regular file (we open and read the symlink target file's content).
-            # thus, in read_special mode, we also want to stat the symlink target
-            # file, for consistency. if we did not, we also have issues extracting
-            # this file, as it would be in the archive as a symlink, not as the
-            # target's file type (which could be e.g. a block device).
-            st = os.stat(path, follow_symlinks=read_special)
+            st = os.lstat(path)
         except OSError as e:
             self.print_warning('%s: %s', path, e)
             return