diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-08 21:10:02 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-08 21:10:02 +0000 |
| commit | 52d3dc08b78a8210a50cc688a735341706dd4159 (patch) | |
| tree | 69fd2ec702b212117872dbf1255d7097fc7f71aa | |
| parent | 72e2f86b18a5c32a22f5cea0af8150355454bc27 (diff) | |
| download | rdiff-backup-52d3dc08b78a8210a50cc688a735341706dd4159.tar.gz | |
Workaround for tempfile.TemporaryFile() having different behavior
on Windows/Cygwin.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@814 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -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) |