Commit 4f895a31 authored by bescoto's avatar bescoto

Removed overly picky error testing for file system abilities


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@553 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 0cae52b0
...@@ -191,11 +191,9 @@ rdiff-backup-data/chars_to_quote. ...@@ -191,11 +191,9 @@ rdiff-backup-data/chars_to_quote.
tmp_rp.chown(uid+1, gid+1) # just choose random uid/gid tmp_rp.chown(uid+1, gid+1) # just choose random uid/gid
tmp_rp.chown(0, 0) tmp_rp.chown(0, 0)
except (IOError, OSError), exc: except (IOError, OSError), exc:
if exc[0] in (errno.EPERM, errno.EINVAL): log.Log("Warning: ownership cannot be changed on filesystem "
log.Log("Warning: ownership cannot be changed on filesystem " "at %s" % (self.root_rp.path,), 3)
"at %s" % (self.root_rp.path,), 3) self.ownership = 0
self.ownership = 0
else: raise
else: self.ownership = 1 else: self.ownership = 1
tmp_rp.delete() tmp_rp.delete()
...@@ -209,11 +207,9 @@ rdiff-backup-data/chars_to_quote. ...@@ -209,11 +207,9 @@ rdiff-backup-data/chars_to_quote.
if hl_source.getinode() != hl_dest.getinode(): if hl_source.getinode() != hl_dest.getinode():
raise IOError(errno.EOPNOTSUPP, "Hard links don't compare") raise IOError(errno.EOPNOTSUPP, "Hard links don't compare")
except (IOError, OSError), exc: except (IOError, OSError), exc:
if exc[0] in (errno.EOPNOTSUPP, errno.EPERM): log.Log("Warning: hard linking not supported by filesystem "
log.Log("Warning: hard linking not supported by filesystem " "at %s" % (self.root_rp.path,), 3)
"at %s" % (self.root_rp.path,), 3) self.hardlinks = 0
self.hardlinks = 0
else: raise
else: self.hardlinks = 1 else: self.hardlinks = 1
def set_fsync_dirs(self, testdir): def set_fsync_dirs(self, testdir):
...@@ -284,11 +280,9 @@ rdiff-backup-data/chars_to_quote. ...@@ -284,11 +280,9 @@ rdiff-backup-data/chars_to_quote.
try: posix1e.ACL(file=rp.path) try: posix1e.ACL(file=rp.path)
except IOError, exc: except IOError, exc:
if exc[0] == errno.EOPNOTSUPP: log.Log("ACLs appear not to be supported by "
log.Log("ACLs appear not to be supported by " "filesystem at %s" % (rp.path,), 4)
"filesystem at %s" % (rp.path,), 4) self.acls = 0
self.acls = 0
else: raise
else: self.acls = 1 else: self.acls = 1
def set_eas(self, rp, write): def set_eas(self, rp, write):
...@@ -308,11 +302,9 @@ rdiff-backup-data/chars_to_quote. ...@@ -308,11 +302,9 @@ rdiff-backup-data/chars_to_quote.
xattr.setxattr(rp.path, "user.test", "test val") xattr.setxattr(rp.path, "user.test", "test val")
assert xattr.getxattr(rp.path, "user.test") == "test val" assert xattr.getxattr(rp.path, "user.test") == "test val"
except IOError, exc: except IOError, exc:
if exc[0] == errno.EOPNOTSUPP: log.Log("Extended attributes not supported by "
log.Log("Extended attributes not supported by " "filesystem at %s" % (rp.path,), 4)
"filesystem at %s" % (rp.path,), 4) self.eas = 0
self.eas = 0
else: raise
else: self.eas = 1 else: self.eas = 1
def set_dir_inc_perms(self, rp): def set_dir_inc_perms(self, rp):
......
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