From 7c001fc6677f6aa64dc9b62072fc3f8e77a6c6cf Mon Sep 17 00:00:00 2001 From: owsla Date: Thu, 1 Jan 2009 16:56:29 +0000 Subject: Disable escape trailing spaces and periods for now git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@987 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/CHANGELOG | 5 +++-- rdiff-backup/rdiff_backup/fs_abilities.py | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 11ef048..a74494c 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,7 +1,8 @@ -New in v1.2.4 (????/??/??) +New in v1.2.4 (2009/01/01) --------------------------- - +Disable escaping trailing spaces and periods for now since it broke remote +restores. Thanks to Dominic for reporting the issue. (Andrew Ferguson) New in v1.2.3 (2008/12/28) diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index aeb0125..d303d7a 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -571,6 +571,10 @@ class FSAbilities: self.escape_dos_devices = 1 def set_escape_trailing_spaces(self, subdir): + # Disable this for 1.2.4 + self.escape_trailing_spaces = 0 + return + """If file with trailing space can't be created, escape such files""" try: space_rp = subdir.append("test ") @@ -697,6 +701,10 @@ class BackupSetGlobals(SetGlobals): def set_must_escape_trailing_spaces(self, rbdir): """If local ets or src ets, then must escape """ + # Disable this for 1.2.4 + SetConnections.UpdateGlobal('must_escape_trailing_spaces', 0) + return + try: space_rp = rbdir.append("test ") space_rp.touch() @@ -827,6 +835,10 @@ class RestoreSetGlobals(SetGlobals): def set_must_escape_trailing_spaces(self, rbdir): """If local ets or src ets, then must escape """ + # Disable this for 1.2.4 + SetConnections.UpdateGlobal('must_escape_trailing_spaces', 0) + return + if getattr(self, "src_fsa", None) is not None: src_ets = self.src_fsa.escape_trailing_spaces else: -- cgit v1.2.1