Commit ecbe2d7f authored by bescoto's avatar bescoto

Checked in Robert Shaw's --chars-to-quote patch


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@558 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent e3686e99
...@@ -21,6 +21,8 @@ Dean Gaudet for bug report.) ...@@ -21,6 +21,8 @@ Dean Gaudet for bug report.)
Fixed user/group restoring error noticed by Fran Firman. 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) New in v0.13.4 (2004/01/31)
--------------------------- ---------------------------
......
...@@ -502,7 +502,7 @@ def restore_set_fs_globals(target): ...@@ -502,7 +502,7 @@ def restore_set_fs_globals(target):
if src_support: Globals.rbdir.conn.Globals.set_local(conn_attr, 1) if src_support: Globals.rbdir.conn.Globals.set_local(conn_attr, 1)
target_fsa = target.conn.fs_abilities.get_fsabilities_readwrite( target_fsa = target.conn.fs_abilities.get_fsabilities_readwrite(
'destination', target, 0) 'destination', target, 0, Globals.chars_to_quote)
Log(str(target_fsa), 3) Log(str(target_fsa), 3)
mirror_fsa = Globals.rbdir.conn.fs_abilities.get_fsabilities_restoresource( mirror_fsa = Globals.rbdir.conn.fs_abilities.get_fsabilities_restoresource(
Globals.rbdir) Globals.rbdir)
...@@ -687,7 +687,8 @@ def single_set_fs_globals(rbdir): ...@@ -687,7 +687,8 @@ def single_set_fs_globals(rbdir):
SetConnections.UpdateGlobal(write_attr, 1) SetConnections.UpdateGlobal(write_attr, 1)
rbdir.conn.Globals.set_local(conn_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) Log(str(fsa), 3)
update_triple(fsa.eas, ('eas_active', 'eas_write', 'eas_conn')) update_triple(fsa.eas, ('eas_active', 'eas_write', 'eas_conn'))
......
...@@ -174,7 +174,7 @@ class FSAbilities: ...@@ -174,7 +174,7 @@ class FSAbilities:
log.Log("Warning: File system no longer needs quoting, " log.Log("Warning: File system no longer needs quoting, "
"but will retain for backwards compatibility.", 2) "but will retain for backwards compatibility.", 2)
self.chars_to_quote = old_chars 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 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 normal file system on to a windows one that cannot support the same
...@@ -280,8 +280,7 @@ rdiff-backup-data/chars_to_quote. ...@@ -280,8 +280,7 @@ rdiff-backup-data/chars_to_quote.
try: posix1e.ACL(file=rp.path) try: posix1e.ACL(file=rp.path)
except IOError, exc: except IOError, exc:
log.Log("ACLs appear not to be supported by " log.Log("ACLs not supported by filesystem at %s" % (rp.path,), 4)
"filesystem at %s" % (rp.path,), 4)
self.acls = 0 self.acls = 0
else: self.acls = 1 else: self.acls = 1
...@@ -291,7 +290,7 @@ rdiff-backup-data/chars_to_quote. ...@@ -291,7 +290,7 @@ rdiff-backup-data/chars_to_quote.
assert rp.lstat() assert rp.lstat()
try: import xattr try: import xattr
except ImportError: 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) "supported on filesystem at %s" % (rp.path,), 4)
self.eas = 0 self.eas = 0
return return
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment