diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/librsync.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 9c8c6fe..062a903 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,9 @@ New in v1.1.12 (????/??/??) --------------------------- +Workaround for tempfile.TemporaryFile() having different behavior +on Windows/Cygwin. (Andrew Ferguson) + Make --check-destination-dir handle quoted situations. (Andrew Ferguson) Handle quoted current_mirror markers and clean-up the listing of diff --git a/rdiff-backup/rdiff_backup/librsync.py b/rdiff-backup/rdiff_backup/librsync.py index d71e475..f3d7c01 100644 --- a/rdiff-backup/rdiff_backup/librsync.py +++ b/rdiff-backup/rdiff_backup/librsync.py @@ -152,6 +152,8 @@ class PatchedFile(LikeFile): """ LikeFile.__init__(self, delta_file) + if hasattr(basis_file, 'file'): + basis_file = basis_file.file if type(basis_file) is not types.FileType: raise TypeError("basis_file must be a (true) file") try: self.maker = _librsync.new_patchmaker(basis_file) |