diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-03-25 23:14:58 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-03-25 23:14:58 +0000 |
| commit | 327bb973694f3f4df68568a61c4f71469dce9058 (patch) | |
| tree | 00ed6f8c6469eec0016fb5730fa6c63fdb0549ad | |
| parent | 11485e22137627864f6230c73317a9f9cc89bc3d (diff) | |
| download | rdiff-backup-327bb973694f3f4df68568a61c4f71469dce9058.tar.gz | |
Checked in Robert Shaw's --chars-to-quote patch
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@558 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 5 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 69b7653..657796a 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -21,6 +21,8 @@ Dean Gaudet for bug report.) Fixed user/group restoring error noticed by Fran Firman. +Checked in Robert Shaw's --chars-to-quote patch + New in v0.13.4 (2004/01/31) --------------------------- diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index 07ca149..2f36859 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -502,7 +502,7 @@ def restore_set_fs_globals(target): if src_support: Globals.rbdir.conn.Globals.set_local(conn_attr, 1) target_fsa = target.conn.fs_abilities.get_fsabilities_readwrite( - 'destination', target, 0) + 'destination', target, 0, Globals.chars_to_quote) Log(str(target_fsa), 3) mirror_fsa = Globals.rbdir.conn.fs_abilities.get_fsabilities_restoresource( Globals.rbdir) @@ -687,7 +687,8 @@ def single_set_fs_globals(rbdir): SetConnections.UpdateGlobal(write_attr, 1) rbdir.conn.Globals.set_local(conn_attr, 1) - fsa = rbdir.conn.fs_abilities.get_fsabilities_readwrite('archive', rbdir) + fsa = rbdir.conn.fs_abilities.get_fsabilities_readwrite('archive', + rbdir, 1, Globals.chars_to_quote) Log(str(fsa), 3) update_triple(fsa.eas, ('eas_active', 'eas_write', 'eas_conn')) diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index d56e58d..612de03 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -174,7 +174,7 @@ class FSAbilities: log.Log("Warning: File system no longer needs quoting, " "but will retain for backwards compatibility.", 2) self.chars_to_quote = old_chars - else: log.FatalError("""New quoting requirements + else: log.Log.FatalError("""New quoting requirements This may be caused when you copy an rdiff-backup directory from a normal file system on to a windows one that cannot support the same @@ -280,8 +280,7 @@ rdiff-backup-data/chars_to_quote. try: posix1e.ACL(file=rp.path) except IOError, exc: - log.Log("ACLs appear not to be supported by " - "filesystem at %s" % (rp.path,), 4) + log.Log("ACLs not supported by filesystem at %s" % (rp.path,), 4) self.acls = 0 else: self.acls = 1 @@ -291,7 +290,7 @@ rdiff-backup-data/chars_to_quote. assert rp.lstat() try: import xattr except ImportError: - log.Log("Unable to import module xattr. EAs not " + log.Log("Unable to import module xattr.\nExtended attributes not " "supported on filesystem at %s" % (rp.path,), 4) self.eas = 0 return |